Converting Binary files to ASCII

34 files changed, 9489 insertions, 9489 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
index d10b1322ba..b01043f7d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
@@ -10,23 +10,23 @@ package org.eclipse.swt.graphics;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.*;
 
-/**

- * Instances of this class manage the operating system resources that

- * implement SWT's RGB color model. To create a color you can either

- * specify the individual color components as integers in the range 

- * 0 to 255 or provide an instance of an <code>RGB</code>. 

- * <p>

- * Application code must explicitly invoke the <code>Color.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required.

- * </p>

- *

- * @see RGB

+/**
+ * Instances of this class manage the operating system resources that
+ * implement SWT's RGB color model. To create a color you can either
+ * specify the individual color components as integers in the range 
+ * 0 to 255 or provide an instance of an <code>RGB</code>. 
+ * <p>
+ * Application code must explicitly invoke the <code>Color.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required.
+ * </p>
+ *
+ * @see RGB
  */
 public final class Color {
-	/**

-	 * the handle to the OS color resource 

-	 * (Warning: This field is platform dependent)

+	/**
+	 * the handle to the OS color resource 
+	 * (Warning: This field is platform dependent)
 	 */
 	public GdkColor handle;
 
@@ -38,29 +38,29 @@ public final class Color {
 Color() {
 }
 
-/**	 

- * Constructs a new instance of this class given a device and the

- * desired red, green and blue values expressed as ints in the range

- * 0 to 255 (where 0 is black and 255 is full brightness). On limited

- * color devices, the color instance created by this call may not have

- * the same RGB values as the ones specified by the arguments. The

- * RGB values on the returned instance will be the color values of 

- * the operating system color.

- * <p>

- * You must dispose the color when it is no longer required. 

- * </p>

- *

- * @param device the device on which to allocate the color

- * @param red the amount of red in the color

- * @param green the amount of green in the color

- * @param blue the amount of blue in the color

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the red, green or blue argument is not between 0 and 255</li>

- * </ul>

- *

- * @see #dispose

+/**	 
+ * Constructs a new instance of this class given a device and the
+ * desired red, green and blue values expressed as ints in the range
+ * 0 to 255 (where 0 is black and 255 is full brightness). On limited
+ * color devices, the color instance created by this call may not have
+ * the same RGB values as the ones specified by the arguments. The
+ * RGB values on the returned instance will be the color values of 
+ * the operating system color.
+ * <p>
+ * You must dispose the color when it is no longer required. 
+ * </p>
+ *
+ * @param device the device on which to allocate the color
+ * @param red the amount of red in the color
+ * @param green the amount of green in the color
+ * @param blue the amount of blue in the color
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the red, green or blue argument is not between 0 and 255</li>
+ * </ul>
+ *
+ * @see #dispose
  */
 public Color(Device device, int red, int green, int blue) {
 	if (device == null) device = Device.getDevice();
@@ -69,27 +69,27 @@ public Color(Device device, int red, int green, int blue) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**	 

- * Constructs a new instance of this class given a device and an

- * <code>RGB</code> describing the desired red, green and blue values.

- * On limited color devices, the color instance created by this call

- * may not have the same RGB values as the ones specified by the

- * argument. The RGB values on the returned instance will be the color

- * values of the operating system color.

- * <p>

- * You must dispose the color when it is no longer required. 

- * </p>

- *

- * @param device the device on which to allocate the color

- * @param RGB the RGB values of the desired color

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the rgb argument is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the red, green or blue components of the argument are not between 0 and 255</li>

- * </ul>

- *

- * @see #dispose

+/**	 
+ * Constructs a new instance of this class given a device and an
+ * <code>RGB</code> describing the desired red, green and blue values.
+ * On limited color devices, the color instance created by this call
+ * may not have the same RGB values as the ones specified by the
+ * argument. The RGB values on the returned instance will be the color
+ * values of the operating system color.
+ * <p>
+ * You must dispose the color when it is no longer required. 
+ * </p>
+ *
+ * @param device the device on which to allocate the color
+ * @param RGB the RGB values of the desired color
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the rgb argument is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the red, green or blue components of the argument are not between 0 and 255</li>
+ * </ul>
+ *
+ * @see #dispose
  */
 public Color(Device device, RGB rgb) {
 	if (device == null) device = Device.getDevice();
@@ -99,10 +99,10 @@ public Color(Device device, RGB rgb) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the color. Applications must dispose of all colors which

- * they allocate.

+/**
+ * Disposes of the operating system resources associated with
+ * the color. Applications must dispose of all colors which
+ * they allocate.
  */
 public void dispose() {
 	if (handle == null) return;
@@ -121,15 +121,15 @@ public void dispose() {
 	device = null;
 }
 
-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
 public boolean equals(Object object) {
 	if (object == this) return true;
@@ -141,69 +141,69 @@ public boolean equals(Object object) {
 		handle.green == gdkColor.green && handle.blue == gdkColor.blue;
 }
 
-/**

- * Returns the amount of blue in the color, from 0 to 255.

- *

- * @return the blue component of the color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the amount of blue in the color, from 0 to 255.
+ *
+ * @return the blue component of the color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getBlue() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return (handle.blue >> 8) & 0xFF;
 }
 
-/**

- * Returns the amount of green in the color, from 0 to 255.

- *

- * @return the green component of the color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the amount of green in the color, from 0 to 255.
+ *
+ * @return the green component of the color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getGreen() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return (handle.green >> 8) & 0xFF;
 }
 
-/**

- * Returns the amount of red in the color, from 0 to 255.

- *

- * @return the red component of the color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the amount of red in the color, from 0 to 255.
+ *
+ * @return the red component of the color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getRed() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return (handle.red >> 8) & 0xFF;
 }
 
-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @see #equals

+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
  */
 public int hashCode() {
 	if (isDisposed()) return 0;
 	return handle.red ^ handle.green ^ handle.blue;
 }
 
-/**

- * Returns an <code>RGB</code> representing the receiver.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns an <code>RGB</code> representing the receiver.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public RGB getRGB () {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -263,25 +263,25 @@ void init(Device device, int red, int green, int blue) {
 	}
 }
 
-/**

- * Returns <code>true</code> if the color has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the color.

- * When a color has been disposed, it is an error to

- * invoke any other method using the color.

- *

- * @return <code>true</code> when the color is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the color has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the color.
+ * When a color has been disposed, it is an error to
+ * invoke any other method using the color.
+ *
+ * @return <code>true</code> when the color is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed() {
 	return handle == null;
 }
 
-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
 public String toString () {
 	if (isDisposed()) return "Color {*DISPOSED*}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
index 4fe50d063a..9f269831e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
@@ -10,34 +10,34 @@ package org.eclipse.swt.graphics;
 import org.eclipse.swt.*;
 import org.eclipse.swt.internal.gtk.*;
 
-/**

- * Instances of this class manage operating system resources that

- * specify the appearance of the on-screen pointer. To create a

- * cursor you specify the device and either a simple cursor style

- * describing one of the standard operating system provided cursors

- * or the image and mask data for the desired appearance.

- * <p>

- * Application code must explicitly invoke the <code>Cursor.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required.

- * </p>

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>

- *   CURSOR_ARROW, CURSOR_WAIT, CURSOR_CROSS, CURSOR_APPSTARTING, CURSOR_HELP,

- *   CURSOR_SIZEALL, CURSOR_SIZENESW, CURSOR_SIZENS, CURSOR_SIZENWSE, CURSOR_SIZEWE,

- *   CURSOR_SIZEN, CURSOR_SIZES, CURSOR_SIZEE, CURSOR_SIZEW, CURSOR_SIZENE, CURSOR_SIZESE,

- *   CURSOR_SIZESW, CURSOR_SIZENW, CURSOR_UPARROW, CURSOR_IBEAM, CURSOR_NO, CURSOR_HAND

- * </dd>

- * </dl>

- * <p>

- * Note: Only one of the above styles may be specified.

- * </p>

+/**
+ * Instances of this class manage operating system resources that
+ * specify the appearance of the on-screen pointer. To create a
+ * cursor you specify the device and either a simple cursor style
+ * describing one of the standard operating system provided cursors
+ * or the image and mask data for the desired appearance.
+ * <p>
+ * Application code must explicitly invoke the <code>Cursor.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required.
+ * </p>
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>
+ *   CURSOR_ARROW, CURSOR_WAIT, CURSOR_CROSS, CURSOR_APPSTARTING, CURSOR_HELP,
+ *   CURSOR_SIZEALL, CURSOR_SIZENESW, CURSOR_SIZENS, CURSOR_SIZENWSE, CURSOR_SIZEWE,
+ *   CURSOR_SIZEN, CURSOR_SIZES, CURSOR_SIZEE, CURSOR_SIZEW, CURSOR_SIZENE, CURSOR_SIZESE,
+ *   CURSOR_SIZESW, CURSOR_SIZENW, CURSOR_UPARROW, CURSOR_IBEAM, CURSOR_NO, CURSOR_HAND
+ * </dd>
+ * </dl>
+ * <p>
+ * Note: Only one of the above styles may be specified.
+ * </p>
  */
 public final class Cursor {
-	/**

-	 * the handle to the OS cursor resource

-	 * (Warning: This field is platform dependent)

+	/**
+	 * the handle to the OS cursor resource
+	 * (Warning: This field is platform dependent)
 	 */
 	public int handle;
 
@@ -49,46 +49,46 @@ public final class Cursor {
 Cursor () {
 }
 
-/**	 

- * Constructs a new cursor given a device and a style

- * constant describing the desired cursor appearance.

- * <p>

- * You must dispose the cursor when it is no longer required. 

- * </p>

- *

- * @param device the device on which to allocate the cursor

- * @param style the style of cursor to allocate

- * 

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_INVALID_ARGUMENT - when an unknown style is specified</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>

- * </ul>

- *

- * @see SWT#CURSOR_ARROW

- * @see SWT#CURSOR_WAIT

- * @see SWT#CURSOR_CROSS

- * @see SWT#CURSOR_APPSTARTING

- * @see SWT#CURSOR_HELP

- * @see SWT#CURSOR_SIZEALL

- * @see SWT#CURSOR_SIZENESW

- * @see SWT#CURSOR_SIZENS

- * @see SWT#CURSOR_SIZENWSE

- * @see SWT#CURSOR_SIZEWE

- * @see SWT#CURSOR_SIZEN

- * @see SWT#CURSOR_SIZES

- * @see SWT#CURSOR_SIZEE

- * @see SWT#CURSOR_SIZEW

- * @see SWT#CURSOR_SIZENE

- * @see SWT#CURSOR_SIZESE

- * @see SWT#CURSOR_SIZESW

- * @see SWT#CURSOR_SIZENW

- * @see SWT#CURSOR_UPARROW

- * @see SWT#CURSOR_IBEAM

- * @see SWT#CURSOR_NO

- * @see SWT#CURSOR_HAND

+/**	 
+ * Constructs a new cursor given a device and a style
+ * constant describing the desired cursor appearance.
+ * <p>
+ * You must dispose the cursor when it is no longer required. 
+ * </p>
+ *
+ * @param device the device on which to allocate the cursor
+ * @param style the style of cursor to allocate
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_INVALID_ARGUMENT - when an unknown style is specified</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>
+ * </ul>
+ *
+ * @see SWT#CURSOR_ARROW
+ * @see SWT#CURSOR_WAIT
+ * @see SWT#CURSOR_CROSS
+ * @see SWT#CURSOR_APPSTARTING
+ * @see SWT#CURSOR_HELP
+ * @see SWT#CURSOR_SIZEALL
+ * @see SWT#CURSOR_SIZENESW
+ * @see SWT#CURSOR_SIZENS
+ * @see SWT#CURSOR_SIZENWSE
+ * @see SWT#CURSOR_SIZEWE
+ * @see SWT#CURSOR_SIZEN
+ * @see SWT#CURSOR_SIZES
+ * @see SWT#CURSOR_SIZEE
+ * @see SWT#CURSOR_SIZEW
+ * @see SWT#CURSOR_SIZENE
+ * @see SWT#CURSOR_SIZESE
+ * @see SWT#CURSOR_SIZESW
+ * @see SWT#CURSOR_SIZENW
+ * @see SWT#CURSOR_UPARROW
+ * @see SWT#CURSOR_IBEAM
+ * @see SWT#CURSOR_NO
+ * @see SWT#CURSOR_HAND
  */
 public Cursor(Device device, int style) {
 	if (device == null) device = Device.getDevice();
@@ -170,37 +170,37 @@ public Cursor(Device device, int style) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**	 

- * Constructs a new cursor given a device, image and mask

- * data describing the desired cursor appearance, and the x

- * and y co-ordinates of the <em>hotspot</em> (that is, the point

- * within the area covered by the cursor which is considered

- * to be where the on-screen pointer is "pointing").

- * <p>

- * The mask data is allowed to be null, but in this case the source

- * must be an ImageData representing an icon that specifies both

- * color data and mask data.

- * <p>

- * You must dispose the cursor when it is no longer required. 

- * </p>

- *

- * @param device the device on which to allocate the cursor

- * @param source the color data for the cursor

- * @param mask the mask data for the cursor (or null)

- * @param hotspotX the x coordinate of the cursor's hotspot

- * @param hotspotY the y coordinate of the cursor's hotspot

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the source is null</li>

- *    <li>ERROR_NULL_ARGUMENT - if the mask is null and the source does not have a mask</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the source and the mask are not the same 

- *          size, or either is not of depth one, or if the hotspot is outside 

- *          the bounds of the image</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>

- * </ul>

+/**	 
+ * Constructs a new cursor given a device, image and mask
+ * data describing the desired cursor appearance, and the x
+ * and y co-ordinates of the <em>hotspot</em> (that is, the point
+ * within the area covered by the cursor which is considered
+ * to be where the on-screen pointer is "pointing").
+ * <p>
+ * The mask data is allowed to be null, but in this case the source
+ * must be an ImageData representing an icon that specifies both
+ * color data and mask data.
+ * <p>
+ * You must dispose the cursor when it is no longer required. 
+ * </p>
+ *
+ * @param device the device on which to allocate the cursor
+ * @param source the color data for the cursor
+ * @param mask the mask data for the cursor (or null)
+ * @param hotspotX the x coordinate of the cursor's hotspot
+ * @param hotspotY the y coordinate of the cursor's hotspot
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the source is null</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the mask is null and the source does not have a mask</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the source and the mask are not the same 
+ *          size, or either is not of depth one, or if the hotspot is outside 
+ *          the bounds of the image</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>
+ * </ul>
  */
 public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
 	if (device == null) device = Device.getDevice();
@@ -280,10 +280,10 @@ public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the cursor. Applications must dispose of all cursors which

- * they allocate.

+/**
+ * Disposes of the operating system resources associated with
+ * the cursor. Applications must dispose of all cursors which
+ * they allocate.
  */
 public void dispose() {
 	if (handle != 0) OS.gdk_cursor_destroy(handle);
@@ -292,15 +292,15 @@ public void dispose() {
 	device = null;
 }
 
-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
 public boolean equals(Object object) {
 	if (object == this) return true;
@@ -332,39 +332,39 @@ public static Cursor gtk_new(Device device, int handle) {
 	return cursor;
 }
 
-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @see #equals

+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
  */
 public int hashCode() {
 	return handle;
 }
 
-/**

- * Returns <code>true</code> if the cursor has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the cursor.

- * When a cursor has been disposed, it is an error to

- * invoke any other method using the cursor.

- *

- * @return <code>true</code> when the cursor is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the cursor has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the cursor.
+ * When a cursor has been disposed, it is an error to
+ * invoke any other method using the cursor.
+ *
+ * @return <code>true</code> when the cursor is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed() {
 	return handle == 0;
 }
 
-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
 public String toString () {
 	if (isDisposed()) return "Cursor {*DISPOSED*}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index 622db39b11..9144cb18fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -11,11 +11,11 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 
-/**

- * This class is the abstract superclass of all device objects,

- * such as the Display device and the Printer device. Devices

- * can have a graphics context (GC) created for them, and they

- * can be drawn on by sending messages to the associated GC.

+/**
+ * This class is the abstract superclass of all device objects,
+ * such as the Display device and the Printer device. Devices
+ * can have a graphics context (GC) created for them, and they
+ * can be drawn on by sending messages to the associated GC.
  */
 public abstract class Device implements Drawable {
 	
@@ -83,17 +83,17 @@ static Device getDevice () {
 	return device;
 }
 
-/**

- * Constructs a new instance of this class.

- * <p>

- * You must dispose the device when it is no longer required. 

- * </p>

- *

- * @param data the DeviceData which describes the receiver

- *

- * @see #create

- * @see #init

- * @see DeviceData

+/**
+ * Constructs a new instance of this class.
+ * <p>
+ * You must dispose the device when it is no longer required. 
+ * </p>
+ *
+ * @param data the DeviceData which describes the receiver
+ *
+ * @see #create
+ * @see #init
+ * @see DeviceData
  */
 public Device(DeviceData data) {
 	if (data != null) {
@@ -118,15 +118,15 @@ protected void checkDevice () {
 protected void create (DeviceData data) {
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the receiver. After this method has been invoked, the receiver

- * will answer <code>true</code> when sent the message

- * <code>isDisposed()</code>.

- *

- * @see #release

- * @see #destroy

- * @see #checkDevice

+/**
+ * Disposes of the operating system resources associated with
+ * the receiver. After this method has been invoked, the receiver
+ * will answer <code>true</code> when sent the message
+ * <code>isDisposed()</code>.
+ *
+ * @see #release
+ * @see #destroy
+ * @see #checkDevice
  */
 public void dispose () {
 	if (isDisposed()) return;
@@ -153,32 +153,32 @@ void dispose_Object (Object object) {
 protected void destroy () {
 }
 
-/**

- * Returns a rectangle describing the receiver's size and location.

- *

- * @return the bounding rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns a rectangle describing the receiver's size and location.
+ *
+ * @return the bounding rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Rectangle getBounds () {
 	checkDevice ();
 	return new Rectangle(0, 0, 0, 0);
 }
 
-/**

- * Returns a <code>DeviceData</code> based on the receiver.

- * Modifications made to this <code>DeviceData</code> will not

- * affect the receiver.

- *

- * @return a <code>DeviceData</code> containing the device's data and attributes

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see DeviceData

+/**
+ * Returns a <code>DeviceData</code> based on the receiver.
+ * Modifications made to this <code>DeviceData</code> will not
+ * affect the receiver.
+ *
+ * @return a <code>DeviceData</code> containing the device's data and attributes
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see DeviceData
  */
 public DeviceData getDeviceData () {
 	checkDevice();
@@ -203,68 +203,68 @@ public DeviceData getDeviceData () {
 	return data;
 }
 
-/**

- * 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_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #getBounds

+/**
+ * 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_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #getBounds
  */
 public Rectangle getClientArea () {
 	checkDevice ();
 	return getBounds ();
 }
 
-/**

- * Returns the bit depth of the screen, which is the number of

- * bits it takes to represent the number of unique colors that

- * the screen is currently capable of displaying. This number 

- * will typically be one of 1, 8, 15, 16, 24 or 32.

- *

- * @return the depth of the screen

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the bit depth of the screen, which is the number of
+ * bits it takes to represent the number of unique colors that
+ * the screen is currently capable of displaying. This number 
+ * will typically be one of 1, 8, 15, 16, 24 or 32.
+ *
+ * @return the depth of the screen
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getDepth () {
 	checkDevice ();
 	return 0;
 }
 
-/**

- * Returns a point whose x coordinate is the horizontal

- * dots per inch of the display, and whose y coordinate

- * is the vertical dots per inch of the display.

- *

- * @return the horizontal and vertical DPI

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns a point whose x coordinate is the horizontal
+ * dots per inch of the display, and whose y coordinate
+ * is the vertical dots per inch of the display.
+ *
+ * @return the horizontal and vertical DPI
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Point getDPI () {
 	checkDevice ();
 	return new Point (72, 72);
 }
 
-/**

- * Returns <code>FontData</code> objects which describe

- * the fonts that match the given arguments. If the

- * <code>faceName</code> is null, all fonts will be returned.

- *

- * @param faceName the name of the font to look for, or null

- * @param scalable true if scalable fonts should be returned.

- * @return the matching font data

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns <code>FontData</code> objects which describe
+ * the fonts that match the given arguments. If the
+ * <code>faceName</code> is null, all fonts will be returned.
+ *
+ * @param faceName the name of the font to look for, or null
+ * @param scalable true if scalable fonts should be returned.
+ * @return the matching font data
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public FontData[] getFontList (String faceName, boolean scalable) {	
 	checkDevice ();
@@ -309,23 +309,23 @@ public FontData[] getFontList (String faceName, boolean scalable) {
 	return result;
 }
 
-/**

- * Returns the matching standard color for the given

- * constant, which should be one of the color constants

- * specified in class <code>SWT</code>. Any value other

- * than one of the SWT color constants which is passed

- * in will result in the color black. This color should

- * not be free'd because it was allocated by the system,

- * not the application.

- *

- * @param id the color constant

- * @return the matching color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see SWT

+/**
+ * Returns the matching standard color for the given
+ * constant, which should be one of the color constants
+ * specified in class <code>SWT</code>. Any value other
+ * than one of the SWT color constants which is passed
+ * in will result in the color black. This color should
+ * not be free'd because it was allocated by the system,
+ * not the application.
+ *
+ * @param id the color constant
+ * @return the matching color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see SWT
  */
 public Color getSystemColor (int id) {
 	checkDevice ();
@@ -350,41 +350,41 @@ public Color getSystemColor (int id) {
 	return COLOR_BLACK;
 }
 
-/**

- * Returns a reasonable font for applications to use.

- * On some platforms, this will match the "default font"

- * or "system font" if such can be found.  This font

- * should not be free'd because it was allocated by the

- * system, not the application.

- * <p>

- * Typically, applications which want the default look

- * should simply not set the font on the widgets they

- * create. Widgets are always created with the correct

- * default font for the class of user-interface component

- * they represent.

- * </p>

- *

- * @return a font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns a reasonable font for applications to use.
+ * On some platforms, this will match the "default font"
+ * or "system font" if such can be found.  This font
+ * should not be free'd because it was allocated by the
+ * system, not the application.
+ * <p>
+ * Typically, applications which want the default look
+ * should simply not set the font on the widgets they
+ * create. Widgets are always created with the correct
+ * default font for the class of user-interface component
+ * they represent.
+ * </p>
+ *
+ * @return a font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Font getSystemFont () {
 	checkDevice ();
 	return systemFont;
 }
 
-/**

- * Returns <code>true</code> if the underlying window system prints out

- * warning messages on the console, and <code>setWarnings</code>

- * had previously been called with <code>true</code>.

- *

- * @return <code>true</code>if warnings are being handled, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the underlying window system prints out
+ * warning messages on the console, and <code>setWarnings</code>
+ * had previously been called with <code>true</code>.
+ *
+ * @return <code>true</code>if warnings are being handled, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public boolean getWarnings () {
 	checkDevice ();
@@ -426,49 +426,49 @@ protected void init () {
 	COLOR_WHITE = new Color (this, 0xFF,0xFF,0xFF);
 }
 
-/**	 

- * Invokes platform specific functionality to allocate a new GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Device</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param data the platform specific GC data 

- * @return the platform specific GC handle

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to allocate a new GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Device</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param data the platform specific GC data 
+ * @return the platform specific GC handle
+ *
+ * @private
  */
 public abstract int internal_new_GC (GCData data);
 
-/**	 

- * Invokes platform specific functionality to dispose a GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Device</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param handle the platform specific GC handle

- * @param data the platform specific GC data 

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to dispose a GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Device</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param handle the platform specific GC handle
+ * @param data the platform specific GC data 
+ *
+ * @private
  */
 public abstract void internal_dispose_GC (int handle, GCData data);
 
-/**

- * Returns <code>true</code> if the device has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the device.

- * When a device has been disposed, it is an error to

- * invoke any other method using the device.

- *

- * @return <code>true</code> when the device is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the device has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the device.
+ * When a device has been disposed, it is an error to
+ * invoke any other method using the device.
+ *
+ * @return <code>true</code> when the device is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed () {
 	return disposed;
@@ -532,17 +532,17 @@ protected void release () {
 	logProc = 0;
 }
 
-/**

- * If the underlying window system supports printing warning messages

- * to the console, setting warnings to <code>true</code> prevents these

- * messages from being printed. If the argument is <code>false</code>

- * message printing is not blocked.

- *

- * @param warnings <code>true</code>if warnings should be handled, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * If the underlying window system supports printing warning messages
+ * to the console, setting warnings to <code>true</code> prevents these
+ * messages from being printed. If the argument is <code>false</code>
+ * message printing is not blocked.
+ *
+ * @param warnings <code>true</code>if warnings should be handled, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setWarnings (boolean warnings) {
 	checkDevice ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
index dca0c2d364..edbaea1494 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
@@ -11,23 +11,23 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 
-/**

- * Instances of this class manage operating system resources that

- * define how text looks when it is displayed. Fonts may be constructed

- * by providing a device and either name, size and style information

- * or a <code>FontData</code> object which encapsulates this data.

- * <p>

- * Application code must explicitly invoke the <code>Font.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required.

- * </p>

- *

- * @see FontData

+/**
+ * Instances of this class manage operating system resources that
+ * define how text looks when it is displayed. Fonts may be constructed
+ * by providing a device and either name, size and style information
+ * or a <code>FontData</code> object which encapsulates this data.
+ * <p>
+ * Application code must explicitly invoke the <code>Font.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required.
+ * </p>
+ *
+ * @see FontData
  */
 public final class Font {
-	/**

-	 * the handle to the OS font resource

-	 * (Warning: This field is platform dependent)

+	/**
+	 * the handle to the OS font resource
+	 * (Warning: This field is platform dependent)
 	 */
 	public int handle;
 
@@ -39,23 +39,23 @@ public final class Font {
 Font() {
 }
 
-/**	 

- * Constructs a new font given a device and font data

- * which describes the desired font's appearance.

- * <p>

- * You must dispose the font when it is no longer required. 

- * </p>

- *

- * @param device the device to create the font on

- * @param fd the FontData that describes the desired font (must not be null)

- * 

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the fd argument is null</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if a font could not be created from the given font data</li>

- * </ul>

+/**	 
+ * Constructs a new font given a device and font data
+ * which describes the desired font's appearance.
+ * <p>
+ * You must dispose the font when it is no longer required. 
+ * </p>
+ *
+ * @param device the device to create the font on
+ * @param fd the FontData that describes the desired font (must not be null)
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the fd argument is null</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if a font could not be created from the given font data</li>
+ * </ul>
  */
 public Font(Device device, FontData fd) {
 	if (device == null) device = Device.getDevice();
@@ -96,27 +96,27 @@ public Font(Device device, FontData[] fds) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**	 

- * Constructs a new font given a device, a font name,

- * the height of the desired font in points, and a font

- * style.

- * <p>

- * You must dispose the font when it is no longer required. 

- * </p>

- *

- * @param device the device to create the font on

- * @param name the name of the font (must not be null)

- * @param height the font height in points

- * @param style a bit or combination of NORMAL, BOLD, ITALIC

- * 

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the name argument is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the height is negative</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if a font could not be created from the given arguments</li>

- * </ul>

+/**	 
+ * Constructs a new font given a device, a font name,
+ * the height of the desired font in points, and a font
+ * style.
+ * <p>
+ * You must dispose the font when it is no longer required. 
+ * </p>
+ *
+ * @param device the device to create the font on
+ * @param name the name of the font (must not be null)
+ * @param height the font height in points
+ * @param style a bit or combination of NORMAL, BOLD, ITALIC
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the name argument is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the height is negative</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if a font could not be created from the given arguments</li>
+ * </ul>
  */
 public Font(Device device, String name, int height, int style) {
 	if (device == null) device = Device.getDevice();
@@ -125,10 +125,10 @@ public Font(Device device, String name, int height, int style) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the font. Applications must dispose of all fonts which

- * they allocate.

+/**
+ * Disposes of the operating system resources associated with
+ * the font. Applications must dispose of all fonts which
+ * they allocate.
  */
 public void dispose() {
 	if (handle != 0) OS.pango_font_description_free(handle);
@@ -137,15 +137,15 @@ public void dispose() {
 	device = null;
 }
 
-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
 public boolean equals(Object object) {
 	if (object == this) return true;
@@ -153,17 +153,17 @@ public boolean equals(Object object) {
 	return handle == ((Font)object).handle;
 }
 
-/**

- * Returns an array of <code>FontData</code>s representing the receiver.

- * On Windows, only one FontData will be returned per font. On X however, 

- * a <code>Font</code> object <em>may</em> be composed of multiple X 

- * fonts. To support this case, we return an array of font data objects.

- *

- * @return an array of font data objects describing the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns an array of <code>FontData</code>s representing the receiver.
+ * On Windows, only one FontData will be returned per font. On X however, 
+ * a <code>Font</code> object <em>may</em> be composed of multiple X 
+ * fonts. To support this case, we return an array of font data objects.
+ *
+ * @return an array of font data objects describing the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public FontData[] getFontData() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -213,15 +213,15 @@ public static Font gtk_new(Device device, int handle) {
 	return font;
 }
 
-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @see #equals

+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
  */
 public int hashCode() {
 	return handle;
@@ -251,25 +251,25 @@ void init(Device device, String name, int height, int style, byte[] fontString)
 	}
 }
 
-/**

- * Returns <code>true</code> if the font has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the font.

- * When a font has been disposed, it is an error to

- * invoke any other method using the font.

- *

- * @return <code>true</code> when the font is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the font has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the font.
+ * When a font has been disposed, it is an error to
+ * invoke any other method using the font.
+ *
+ * @return <code>true</code> when the font is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed() {
 	return handle == 0;
 }
 
-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
 public String toString () {
 	if (isDisposed()) return "Font {*DISPOSED*}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java
index e725a5e473..28788204a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java
@@ -1,77 +1,77 @@
-package org.eclipse.swt.graphics;

-

-/*

+package org.eclipse.swt.graphics;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-

-/**

- * Instances of this class describe operating system fonts.

- * Only the public API of this type is platform independent.

- * <p>

- * For platform-independent behaviour, use the get and set methods

- * corresponding to the following properties:

- * <dl>

- * <dt>height</dt><dd>the height of the font in points</dd>

- * <dt>name</dt><dd>the face name of the font, which may include the foundry</dd>

- * <dt>style</dt><dd>A bitwise combination of NORMAL, ITALIC and BOLD</dd>

- * </dl>

- * If extra, platform-dependent functionality is required:

- * <ul>

- * <li>On <em>Windows</em>, the data member of the <code>FontData</code>

- * corresponds to a Windows <code>LOGFONT</code> structure whose fields

- * may be retrieved and modified.</li>

- * <li>On <em>X</em>, the fields of the <code>FontData</code> correspond

- * to the entries in the font's XLFD name and may be retrieved and modified.

- * </ul>

- * Application code does <em>not</em> need to explicitly release the

- * resources managed by each instance when those instances are no longer

- * required, and thus no <code>dispose()</code> method is provided.

- *

- * @see Font

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public final class FontData {

-	/**

-	 * the font name

-	 * (Warning: This field is platform dependent)

+
+import org.eclipse.swt.*;
+
+/**
+ * Instances of this class describe operating system fonts.
+ * Only the public API of this type is platform independent.
+ * <p>
+ * For platform-independent behaviour, use the get and set methods
+ * corresponding to the following properties:
+ * <dl>
+ * <dt>height</dt><dd>the height of the font in points</dd>
+ * <dt>name</dt><dd>the face name of the font, which may include the foundry</dd>
+ * <dt>style</dt><dd>A bitwise combination of NORMAL, ITALIC and BOLD</dd>
+ * </dl>
+ * If extra, platform-dependent functionality is required:
+ * <ul>
+ * <li>On <em>Windows</em>, the data member of the <code>FontData</code>
+ * corresponds to a Windows <code>LOGFONT</code> structure whose fields
+ * may be retrieved and modified.</li>
+ * <li>On <em>X</em>, the fields of the <code>FontData</code> correspond
+ * to the entries in the font's XLFD name and may be retrieved and modified.
+ * </ul>
+ * Application code does <em>not</em> need to explicitly release the
+ * resources managed by each instance when those instances are no longer
+ * required, and thus no <code>dispose()</code> method is provided.
+ *
+ * @see Font
+ */
+public final class FontData {
+	/**
+	 * the font name
+	 * (Warning: This field is platform dependent)
 	 */
-	public String name;

-

-	/**

-	 * The height of the font data in points

-	 * (Warning: This field is platform dependent)

+	public String name;
+
+	/**
+	 * The height of the font data in points
+	 * (Warning: This field is platform dependent)
 	 */
-	public int height;

-

-	/**

-	 * the font style

-	 * (Warning: This field is platform dependent)

+	public int height;
+
+	/**
+	 * the font style
+	 * (Warning: This field is platform dependent)
 	 */
-	public int style;

-	

-	/**

-	 * the Pango string 

-	 * (Warning: This field is platform dependent)

+	public int style;
+	
+	/**
+	 * the Pango string 
+	 * (Warning: This field is platform dependent)
 	 */
-	public byte[] string;

-

-	/**

-	 * The locales of the font

-	 * (Warning: These fields are platform dependent)

+	public byte[] string;
+
+	/**
+	 * The locales of the font
+	 * (Warning: These fields are platform dependent)
 	 */
-	String lang, country, variant;

-	

+	String lang, country, variant;
+	
 /**	 
  * Constructs a new un-initialized font data.
  */
-public FontData () {

-	this("", 12, SWT.NORMAL);

-}

-

+public FontData () {
+	this("", 12, SWT.NORMAL);
+}
+
 /**
  * Constructs a new FontData given a string representation
  * in the form generated by the <code>FontData.toString</code>
@@ -91,61 +91,61 @@ public FontData () {
  *
  * @see #toString
  */
-public FontData(String string) {

-	if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	int start = 0;

-	int end = string.indexOf('|');

-	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	String version1 = string.substring(start, end);

-	try {

-		if (Integer.parseInt(version1) != 1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	} catch (NumberFormatException e) {

-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	}

-	

-	start = end + 1;

-	end = string.indexOf('|', start);

-	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	String name = string.substring(start, end);

-	

-	start = end + 1;

-	end = string.indexOf('|', start);

-	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	int height = 0;

-	try {

-		height = Integer.parseInt(string.substring(start, end));

-	} catch (NumberFormatException e) {

-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	}

-	

-	start = end + 1;

-	end = string.indexOf('|', start);

-	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	int style = 0;

-	try {

-		style = Integer.parseInt(string.substring(start, end));

-	} catch (NumberFormatException e) {

-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	}

-

-	start = end + 1;

-	end = string.indexOf('|', start);

-	setName(name);

-	setHeight(height);

-	setStyle(style);

-	if (end == -1) return;

-	String platform = string.substring(start, end);

-

-	start = end + 1;

-	end = string.indexOf('|', start);

-	if (end == -1) return;

-	String version2 = string.substring(start, end);

-

-	if (platform.equals("GTK") && version2.equals("1")) {

-		return;

-	}

-}

-

+public FontData(String string) {
+	if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	int start = 0;
+	int end = string.indexOf('|');
+	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	String version1 = string.substring(start, end);
+	try {
+		if (Integer.parseInt(version1) != 1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	} catch (NumberFormatException e) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+	
+	start = end + 1;
+	end = string.indexOf('|', start);
+	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	String name = string.substring(start, end);
+	
+	start = end + 1;
+	end = string.indexOf('|', start);
+	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	int height = 0;
+	try {
+		height = Integer.parseInt(string.substring(start, end));
+	} catch (NumberFormatException e) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+	
+	start = end + 1;
+	end = string.indexOf('|', start);
+	if (end == -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	int style = 0;
+	try {
+		style = Integer.parseInt(string.substring(start, end));
+	} catch (NumberFormatException e) {
+		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+
+	start = end + 1;
+	end = string.indexOf('|', start);
+	setName(name);
+	setHeight(height);
+	setStyle(style);
+	if (end == -1) return;
+	String platform = string.substring(start, end);
+
+	start = end + 1;
+	end = string.indexOf('|', start);
+	if (end == -1) return;
+	String version2 = string.substring(start, end);
+
+	if (platform.equals("GTK") && version2.equals("1")) {
+		return;
+	}
+}
+
 /**	 
  * Constructs a new font data given a font name,
  * the height of the desired font in points, 
@@ -160,66 +160,66 @@ public FontData(String string) {
  *    <li>ERROR_INVALID_ARGUMENT - if the height is negative</li>
  * </ul>
  */
-public FontData(String name, int height, int style) {

-	setName(name);

-	setHeight(height);

-	setStyle(style);

-}

-

-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+public FontData(String name, int height, int style) {
+	setName(name);
+	setHeight(height);
+	setStyle(style);
+}
+
+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
-public boolean equals (Object object) {

-	if (object == this) return true;

-	if (!(object instanceof FontData)) return false;

-	FontData data = (FontData)object;

-	return name.equals(data.name) && height == data.height && style == data.style;

-}

-

-/**

- * Returns the height of the receiver in points.

- *

- * @return the height of this FontData

- *

- * @see #setHeight

+public boolean equals (Object object) {
+	if (object == this) return true;
+	if (!(object instanceof FontData)) return false;
+	FontData data = (FontData)object;
+	return name.equals(data.name) && height == data.height && style == data.style;
+}
+
+/**
+ * Returns the height of the receiver in points.
+ *
+ * @return the height of this FontData
+ *
+ * @see #setHeight
  */
-public int getHeight() {

-	return height;

-}

-

-/**

- * Returns the name of the receiver.

- * On platforms that support font foundries, the return value will

- * be the foundry followed by a dash ("-") followed by the face name.

- *

- * @return the name of this <code>FontData</code>

- *

- * @see #setName

+public int getHeight() {
+	return height;
+}
+
+/**
+ * Returns the name of the receiver.
+ * On platforms that support font foundries, the return value will
+ * be the foundry followed by a dash ("-") followed by the face name.
+ *
+ * @return the name of this <code>FontData</code>
+ *
+ * @see #setName
  */
-public String getName() {

-	return name;

-}

-

-/**

- * Returns the style of the receiver which is a bitwise OR of 

- * one or more of the <code>SWT</code> constants NORMAL, BOLD

- * and ITALIC.

- *

- * @return the style of this <code>FontData</code>

- * 

- * @see #setStyle

+public String getName() {
+	return name;
+}
+
+/**
+ * Returns the style of the receiver which is a bitwise OR of 
+ * one or more of the <code>SWT</code> constants NORMAL, BOLD
+ * and ITALIC.
+ *
+ * @return the style of this <code>FontData</code>
+ * 
+ * @see #setStyle
  */
-public int getStyle() {

-	return style;

-}

-

+public int getStyle() {
+	return style;
+}
+
 /**
  * Returns an integer hash code for the receiver. Any two 
  * objects which return <code>true</code> when passed to 
@@ -230,10 +230,10 @@ public int getStyle() {
  *
  * @see #equals
  */
-public int hashCode () {

-	return name.hashCode() ^ height ^ style;

-}

-

+public int hashCode () {
+	return name.hashCode() ^ height ^ style;
+}
+
 /**
  * Sets the height of the receiver. The parameter is
  * specified in terms of points, where a point is one
@@ -247,49 +247,49 @@ public int hashCode () {
  * 
  * @see #getHeight
  */
-public void setHeight(int height) {

-	if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	this.height = height;

-	this.string = null;

-}

-

-/**

- * Sets the locale of the receiver.

- * <p>

- * The locale determines which platform character set this

- * font is going to use. Widgets and graphics operations that

- * use this font will convert UNICODE strings to the platform

- * character set of the specified locale.

- * </p>

- * <p>

- * On platforms which there are multiple character sets for a

- * given language/country locale, the variant portion of the

- * locale will determine the character set.

- * </p>

- * 

- * @param locale the <code>String</code> representing a Locale object

- * @see java.util.Locale#toString

+public void setHeight(int height) {
+	if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	this.height = height;
+	this.string = null;
+}
+
+/**
+ * Sets the locale of the receiver.
+ * <p>
+ * The locale determines which platform character set this
+ * font is going to use. Widgets and graphics operations that
+ * use this font will convert UNICODE strings to the platform
+ * character set of the specified locale.
+ * </p>
+ * <p>
+ * On platforms which there are multiple character sets for a
+ * given language/country locale, the variant portion of the
+ * locale will determine the character set.
+ * </p>
+ * 
+ * @param locale the <code>String</code> representing a Locale object
+ * @see java.util.Locale#toString
  */
-public void setLocale(String locale) {

-	lang = country = variant = null;

-	if (locale != null) {

-		char sep = '_';

-		int length = locale.length();

-		int firstSep, secondSep;

-		

-		firstSep = locale.indexOf(sep);

-		if (firstSep == -1) {

-			firstSep = secondSep = length;

-		} else {

-			secondSep = locale.indexOf(sep, firstSep + 1);

-			if (secondSep == -1) secondSep = length;

-		}

-		if (firstSep > 0) lang = locale.substring(0, firstSep);

-		if (secondSep > firstSep + 1) country = locale.substring(firstSep + 1, secondSep);

-		if (length > secondSep + 1) variant = locale.substring(secondSep + 1);

-	}	

-}

-

+public void setLocale(String locale) {
+	lang = country = variant = null;
+	if (locale != null) {
+		char sep = '_';
+		int length = locale.length();
+		int firstSep, secondSep;
+		
+		firstSep = locale.indexOf(sep);
+		if (firstSep == -1) {
+			firstSep = secondSep = length;
+		} else {
+			secondSep = locale.indexOf(sep, firstSep + 1);
+			if (secondSep == -1) secondSep = length;
+		}
+		if (firstSep > 0) lang = locale.substring(0, firstSep);
+		if (secondSep > firstSep + 1) country = locale.substring(firstSep + 1, secondSep);
+		if (length > secondSep + 1) variant = locale.substring(secondSep + 1);
+	}	
+}
+
 /**
  * Sets the name of the receiver.
  * <p>
@@ -315,12 +315,12 @@ public void setLocale(String locale) {
  *
  * @see #getName
  */
-public void setName(String name) {

-	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	this.name = name;

-	this.string = null;

-}

-

+public void setName(String name) {
+	if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	this.name = name;
+	this.string = null;
+}
+
 /**
  * Sets the style of the receiver to the argument which must
  * be a bitwise OR of one or more of the <code>SWT</code> 
@@ -330,11 +330,11 @@ public void setName(String name) {
  *
  * @see #getStyle
  */
-public void setStyle(int style) {

-	this.style = style;

-	this.string = null;

-}

-

+public void setStyle(int style) {
+	this.style = style;
+	this.string = null;
+}
+
 /**
  * Returns a string representation of the receiver which is suitable
  * for constructing an equivalent instance using the 
@@ -344,17 +344,17 @@ public void setStyle(int style) {
  *
  * @see FontData
  */
-public String toString() {

-	StringBuffer buffer = new StringBuffer();

-	buffer.append("1|");

-	buffer.append(getName());

-	buffer.append("|");

-	buffer.append(getHeight());

-	buffer.append("|");

-	buffer.append(getStyle());

-	buffer.append("|");

-	buffer.append("GTK|1|");	

-	return buffer.toString();

-}

-

-}

+public String toString() {
+	StringBuffer buffer = new StringBuffer();
+	buffer.append("1|");
+	buffer.append(getName());
+	buffer.append("|");
+	buffer.append(getHeight());
+	buffer.append("|");
+	buffer.append(getStyle());
+	buffer.append("|");
+	buffer.append("GTK|1|");	
+	return buffer.toString();
+}
+
+}
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 ca8787fbe6..5a65657044 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
@@ -1,12 +1,12 @@
-package org.eclipse.swt.graphics;

-

-/*

+package org.eclipse.swt.graphics;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
 /**
  * Instances of this class provide measurement information
  * about fonts including ascent, descent, height, leading
@@ -16,12 +16,12 @@ package org.eclipse.swt.graphics;
  *
  * @see GC#getFontMetrics
  */
-public final class FontMetrics {

-	int ascent, descent, averageCharWidth, leading, height;

-

-FontMetrics() {

-}

-

+public final class FontMetrics {
+	int ascent, descent, averageCharWidth, leading, height;
+
+FontMetrics() {
+}
+
 /**
  * Compares the argument to the receiver, and returns true
  * if they represent the <em>same</em> object using a class
@@ -32,15 +32,15 @@ FontMetrics() {
  *
  * @see #hashCode
  */
-public boolean equals (Object object) {

-	if (object == this) return true;

-	if (!(object instanceof FontMetrics)) return false;

-	FontMetrics metrics = (FontMetrics)object;

-	return ascent == metrics.ascent && descent == metrics.descent &&

-		averageCharWidth == metrics.averageCharWidth && leading == metrics.leading &&

-		height == metrics.height;

-}

-

+public boolean equals (Object object) {
+	if (object == this) return true;
+	if (!(object instanceof FontMetrics)) return false;
+	FontMetrics metrics = (FontMetrics)object;
+	return ascent == metrics.ascent && descent == metrics.descent &&
+		averageCharWidth == metrics.averageCharWidth && leading == metrics.leading &&
+		height == metrics.height;
+}
+
 /**
  * Returns the ascent of the font described by the receiver. A
  * font's <em>ascent</em> is the distance from the baseline to the 
@@ -49,20 +49,20 @@ public boolean equals (Object object) {
  *
  * @return the ascent of the font
  */
-public int getAscent() {

-	return ascent;

-}

-

+public int getAscent() {
+	return ascent;
+}
+
 /**
  * Returns the average character width, measured in pixels,
  * of the font described by the receiver.
  *
  * @return the average character width of the font
  */
-public int getAverageCharWidth() {

-	return averageCharWidth;

-}

-

+public int getAverageCharWidth() {
+	return averageCharWidth;
+}
+
 /**
  * Returns the descent of the font described by the receiver. A
  * font's <em>descent</em> is the distance from the baseline to the
@@ -71,10 +71,10 @@ public int getAverageCharWidth() {
  *
  * @return the descent of the font
  */
-public int getDescent() {

-	return descent;

-}

-

+public int getDescent() {
+	return descent;
+}
+
 /**
  * Returns the height of the font described by the receiver, 
  * measured in pixels. A font's <em>height</em> is the sum of
@@ -86,10 +86,10 @@ public int getDescent() {
  * @see #getDescent
  * @see #getLeading
  */
-public int getHeight() {

-	return height;

-}

-

+public int getHeight() {
+	return height;
+}
+
 /**
  * Returns the leading area of the font described by the
  * receiver. A font's <em>leading area</em> is the space
@@ -97,10 +97,10 @@ public int getHeight() {
  *
  * @return the leading space of the font
  */
-public int getLeading() {

-	return leading;

-}

-

+public int getLeading() {
+	return leading;
+}
+
 /**
  * Returns an integer hash code for the receiver. Any two 
  * objects which return <code>true</code> when passed to 
@@ -111,8 +111,8 @@ public int getLeading() {
  *
  * @see #equals
  */
-public int hashCode() {

-	return ascent ^ descent ^ averageCharWidth ^ leading ^ height;

-}

-

-}

+public int hashCode() {
+	return ascent ^ descent ^ averageCharWidth ^ leading ^ height;
+}
+
+}
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 5df563ea03..e043ae233a 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
@@ -11,24 +11,24 @@ import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.*;
 
-/**

- * Class <code>GC</code> is where all of the drawing capabilities that are 

- * supported by SWT are located. Instances are used to draw on either an 

- * <code>Image</code>, a <code>Control</code>, or directly on a <code>Display</code>.

- * <p>

- * Application code must explicitly invoke the <code>GC.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required. This is <em>particularly</em>

- * important on Windows95 and Windows98 where the operating system has a limited

- * number of device contexts available.

- * </p>

- *

- * @see org.eclipse.swt.events.PaintEvent

+/**
+ * Class <code>GC</code> is where all of the drawing capabilities that are 
+ * supported by SWT are located. Instances are used to draw on either an 
+ * <code>Image</code>, a <code>Control</code>, or directly on a <code>Display</code>.
+ * <p>
+ * Application code must explicitly invoke the <code>GC.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required. This is <em>particularly</em>
+ * important on Windows95 and Windows98 where the operating system has a limited
+ * number of device contexts available.
+ * </p>
+ *
+ * @see org.eclipse.swt.events.PaintEvent
  */
 public final class GC {
-	/**

-	 * the handle to the OS device context

-	 * (Warning: This field is platform dependent)

+	/**
+	 * the handle to the OS device context
+	 * (Warning: This field is platform dependent)
 	 */
 	public int handle;
 	
@@ -38,26 +38,26 @@ public final class GC {
 GC() {
 }
 
-/**	 

- * Constructs a new instance of this class which has been

- * configured to draw on the specified drawable. Sets the

- * foreground and background color in the GC to match those

- * in the drawable.

- * <p>

- * You must dispose the graphics context when it is no longer required. 

- * </p>

- * @param drawable the drawable to draw on

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the drawable is null</li>

- *    <li>ERROR_NULL_ARGUMENT - if there is no current device</li>

- *    <li>ERROR_INVALID_ARGUMENT

- *          - if the drawable is an image that is not a bitmap or an icon

- *          - if the drawable is an image or printer that is already selected

- *            into another graphics context</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>

- * </ul>

+/**	 
+ * Constructs a new instance of this class which has been
+ * configured to draw on the specified drawable. Sets the
+ * foreground and background color in the GC to match those
+ * in the drawable.
+ * <p>
+ * You must dispose the graphics context when it is no longer required. 
+ * </p>
+ * @param drawable the drawable to draw on
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the drawable is null</li>
+ *    <li>ERROR_NULL_ARGUMENT - if there is no current device</li>
+ *    <li>ERROR_INVALID_ARGUMENT
+ *          - if the drawable is an image that is not a bitmap or an icon
+ *          - if the drawable is an image or printer that is already selected
+ *            into another graphics context</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>
+ * </ul>
  */
 public GC(Drawable drawable) {
 	if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -71,20 +71,20 @@ public GC(Drawable drawable) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Copies a rectangular area of the receiver at the specified

- * position into the image, which must be of type <code>SWT.BITMAP</code>.

- *

- * @param x the x coordinate in the receiver of the area to be copied

- * @param y the y coordinate in the receiver of the area to be copied

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the image is not a bitmap or has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Copies a rectangular area of the receiver at the specified
+ * position into the image, which must be of type <code>SWT.BITMAP</code>.
+ *
+ * @param x the x coordinate in the receiver of the area to be copied
+ * @param y the y coordinate in the receiver of the area to be copied
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image is not a bitmap or has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void copyArea(Image image, int x, int y) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -98,20 +98,20 @@ public void copyArea(Image image, int x, int y) {
 	OS.g_object_unref(gdkGC);
 }
 
-/**

- * Copies a rectangular area of the receiver at the source

- * position onto the receiver at the destination position.

- *

- * @param srcX the x coordinate in the receiver of the area to be copied

- * @param srcY the y coordinate in the receiver of the area to be copied

- * @param width the width of the area to copy

- * @param height the height of the area to copy

- * @param destX the x coordinate in the receiver of the area to copy to

- * @param destY the y coordinate in the receiver of the area to copy to

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Copies a rectangular area of the receiver at the source
+ * position onto the receiver at the destination position.
+ *
+ * @param srcX the x coordinate in the receiver of the area to be copied
+ * @param srcY the y coordinate in the receiver of the area to be copied
+ * @param width the width of the area to copy
+ * @param height the height of the area to copy
+ * @param destX the x coordinate in the receiver of the area to copy to
+ * @param destY the y coordinate in the receiver of the area to copy to
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void copyArea(int srcX, int srcY, int width, int height, int destX, int destY) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -156,10 +156,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
 	}
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the graphics context. Applications must dispose of all GCs

- * which they allocate.

+/**
+ * Disposes of the operating system resources associated with
+ * the graphics context. Applications must dispose of all GCs
+ * which they allocate.
  */
 public void dispose() {
 	if (handle == 0) return;
@@ -192,37 +192,37 @@ public void dispose() {
 	data = null;
 }
 
-/**

- * Draws the outline of a circular or elliptical arc 

- * within the specified rectangular area.

- * <p>

- * The resulting arc begins at <code>startAngle</code> and extends  

- * for <code>arcAngle</code> degrees, using the current color.

- * Angles are interpreted such that 0 degrees is at the 3 o'clock

- * position. A positive value indicates a counter-clockwise rotation

- * while a negative value indicates a clockwise rotation.

- * </p><p>

- * The center of the arc is the center of the rectangle whose origin 

- * 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.

- * </p>

- *

- * @param x the x coordinate of the upper-left corner of the arc to be drawn

- * @param y the y coordinate of the upper-left corner of the arc to be drawn

- * @param width the width of the arc to be drawn

- * @param height the height of the arc to be drawn

- * @param startAngle the beginning angle

- * @param arcAngle the angular extent of the arc, relative to the start angle

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if any of the width, height or endAngle is zero.</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Draws the outline of a circular or elliptical arc 
+ * within the specified rectangular area.
+ * <p>
+ * The resulting arc begins at <code>startAngle</code> and extends  
+ * for <code>arcAngle</code> degrees, using the current color.
+ * Angles are interpreted such that 0 degrees is at the 3 o'clock
+ * position. A positive value indicates a counter-clockwise rotation
+ * while a negative value indicates a clockwise rotation.
+ * </p><p>
+ * The center of the arc is the center of the rectangle whose origin 
+ * 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.
+ * </p>
+ *
+ * @param x the x coordinate of the upper-left corner of the arc to be drawn
+ * @param y the y coordinate of the upper-left corner of the arc to be drawn
+ * @param width the width of the arc to be drawn
+ * @param height the height of the arc to be drawn
+ * @param startAngle the beginning angle
+ * @param arcAngle the angular extent of the arc, relative to the start angle
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if any of the width, height or endAngle is zero.</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawArc(int x, int y, int width, int height, int startAngle, int endAngle) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -240,22 +240,22 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int end
 	OS.gdk_draw_arc(data.drawable, handle, 0, x, y, width, height, startAngle * 64, endAngle * 64);
 }
 
-/** 

- * Draws a rectangle, based on the specified arguments, which has

- * the appearance of the platform's <em>focus rectangle</em> if the

- * platform supports such a notion, and otherwise draws a simple

- * rectangle in the receiver's foreground color.

- *

- * @param x the x coordinate of the rectangle

- * @param y the y coordinate of the rectangle

- * @param width the width of the rectangle

- * @param height the height of the rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawRectangle

+/** 
+ * Draws a rectangle, based on the specified arguments, which has
+ * the appearance of the platform's <em>focus rectangle</em> if the
+ * platform supports such a notion, and otherwise draws a simple
+ * rectangle in the receiver's foreground color.
+ *
+ * @param x the x coordinate of the rectangle
+ * @param y the y coordinate of the rectangle
+ * @param width the width of the rectangle
+ * @param height the height of the rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawRectangle
  */
 public void drawFocus(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -278,24 +278,24 @@ public void drawFocus(int x, int y, int width, int height) {
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/**

- * Draws the given image in the receiver at the specified

- * coordinates.

- *

- * @param image the image to draw

- * @param x the x coordinate of where to draw

- * @param y the y coordinate of where to draw

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the given coordinates are outside the bounds of the image</li>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Draws the given image in the receiver at the specified
+ * coordinates.
+ *
+ * @param image the image to draw
+ * @param x the x coordinate of where to draw
+ * @param y the y coordinate of where to draw
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the given coordinates are outside the bounds of the image</li>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawImage(Image image, int x, int y) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -304,37 +304,37 @@ public void drawImage(Image image, int x, int y) {
 	drawImage(image, 0, 0, -1, -1, x, y, -1, -1, true);
 }
 
-/**

- * Copies a rectangular area from the source image into a (potentially

- * different sized) rectangular area in the receiver. If the source

- * and destination areas are of differing sizes, then the source

- * area will be stretched or shrunk to fit the destination area

- * as it is copied. The copy fails if any part of the source rectangle

- * lies outside the bounds of the source image, or if any of the width

- * or height arguments are negative.

- *

- * @param image the source image

- * @param srcX the x coordinate in the source image to copy from

- * @param srcY the y coordinate in the source image to copy from

- * @param srcWidth the width in pixels to copy from the source

- * @param srcHeight the height in pixels to copy from the source

- * @param destX the x coordinate in the destination to copy to

- * @param destY the y coordinate in the destination to copy to

- * @param destWidth the width in pixels of the destination rectangle

- * @param destHeight the height in pixels of the destination rectangle

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>

- *    <li>ERROR_INVALID_ARGUMENT - if any of the width or height arguments are negative.

- *    <li>ERROR_INVALID_ARGUMENT - if the source rectangle is not contained within the bounds of the source image</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Copies a rectangular area from the source image into a (potentially
+ * different sized) rectangular area in the receiver. If the source
+ * and destination areas are of differing sizes, then the source
+ * area will be stretched or shrunk to fit the destination area
+ * as it is copied. The copy fails if any part of the source rectangle
+ * lies outside the bounds of the source image, or if any of the width
+ * or height arguments are negative.
+ *
+ * @param image the source image
+ * @param srcX the x coordinate in the source image to copy from
+ * @param srcY the y coordinate in the source image to copy from
+ * @param srcWidth the width in pixels to copy from the source
+ * @param srcHeight the height in pixels to copy from the source
+ * @param destX the x coordinate in the destination to copy to
+ * @param destY the y coordinate in the destination to copy to
+ * @param destWidth the width in pixels of the destination rectangle
+ * @param destHeight the height in pixels of the destination rectangle
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the image is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if any of the width or height arguments are negative.
+ *    <li>ERROR_INVALID_ARGUMENT - if the source rectangle is not contained within the bounds of the source image</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -482,44 +482,44 @@ int scale(int src, int srcX, int srcY, int srcWidth, int srcHeight, int destWidt
 	return scaledPixbuf;
 }
 
-/** 

- * Draws a line, using the foreground color, between the points 

- * (<code>x1</code>, <code>y1</code>) and (<code>x2</code>, <code>y2</code>).

- *

- * @param x1 the first point's x coordinate

- * @param y1 the first point's y coordinate

- * @param x2 the second point's x coordinate

- * @param y2 the second point's y coordinate

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws a line, using the foreground color, between the points 
+ * (<code>x1</code>, <code>y1</code>) and (<code>x2</code>, <code>y2</code>).
+ *
+ * @param x1 the first point's x coordinate
+ * @param y1 the first point's y coordinate
+ * @param x2 the second point's x coordinate
+ * @param y2 the second point's y coordinate
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawLine(int x1, int y1, int x2, int y2) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	OS.gdk_draw_line (data.drawable, handle, x1, y1, x2, y2);
 }
 
-/** 

- * Draws the outline of an oval, using the foreground color,

- * within the specified rectangular area.

- * <p>

- * The result is a circle or ellipse that fits within the 

- * rectangle specified by the <code>x</code>, <code>y</code>, 

- * <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.

- * </p>

- *

- * @param x the x coordinate of the upper left corner of the oval to be drawn

- * @param y the y coordinate of the upper left corner of the oval to be drawn

- * @param width the width of the oval to be drawn

- * @param height the height of the oval to be drawn

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the outline of an oval, using the foreground color,
+ * within the specified rectangular area.
+ * <p>
+ * The result is a circle or ellipse that fits within the 
+ * rectangle specified by the <code>x</code>, <code>y</code>, 
+ * <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.
+ * </p>
+ *
+ * @param x the x coordinate of the upper left corner of the oval to be drawn
+ * @param y the y coordinate of the upper left corner of the oval to be drawn
+ * @param width the width of the oval to be drawn
+ * @param height the height of the oval to be drawn
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawOval(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -534,44 +534,44 @@ public void drawOval(int x, int y, int width, int height) {
 	OS.gdk_draw_arc(data.drawable, handle, 0, x, y, width, height, 0, 23040);
 }
 
-/** 

- * Draws the closed polygon which is defined by the specified array

- * of integer coordinates, using the receiver's foreground color. The array 

- * contains alternating x and y values which are considered to represent

- * points which are the vertices of the polygon. Lines are drawn between

- * each consecutive pair, and between the first pair and last pair in the

- * array.

- *

- * @param pointArray an array of alternating x and y values which are the vertices of the polygon

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the closed polygon which is defined by the specified array
+ * of integer coordinates, using the receiver's foreground color. The array 
+ * contains alternating x and y values which are considered to represent
+ * points which are the vertices of the polygon. Lines are drawn between
+ * each consecutive pair, and between the first pair and last pair in the
+ * array.
+ *
+ * @param pointArray an array of alternating x and y values which are the vertices of the polygon
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawPolygon(int[] pointArray) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	OS.gdk_draw_polygon(data.drawable, handle, 0, pointArray, pointArray.length / 2);
 }
-/** 

- * Draws the polyline which is defined by the specified array

- * of integer coordinates, using the receiver's foreground color. The array 

- * contains alternating x and y values which are considered to represent

- * points which are the corners of the polyline. Lines are drawn between

- * each consecutive pair, but not between the first pair and last pair in

- * the array.

- *

- * @param pointArray an array of alternating x and y values which are the corners of the polyline

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point array is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the polyline which is defined by the specified array
+ * of integer coordinates, using the receiver's foreground color. The array 
+ * contains alternating x and y values which are considered to represent
+ * points which are the corners of the polyline. Lines are drawn between
+ * each consecutive pair, but not between the first pair and last pair in
+ * the array.
+ *
+ * @param pointArray an array of alternating x and y values which are the corners of the polyline
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point array is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawPolyline(int[] pointArray) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -579,20 +579,20 @@ public void drawPolyline(int[] pointArray) {
 	OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);
 }
 
-/** 

- * Draws the outline of the rectangle specified by the arguments,

- * using the receiver's foreground color. The left and right edges

- * of the rectangle are at <code>x</code> and <code>x + width</code>. 

- * The top and bottom edges are at <code>y</code> and <code>y + height</code>. 

- *

- * @param x the x coordinate of the rectangle to be drawn

- * @param y the y coordinate of the rectangle to be drawn

- * @param width the width of the rectangle to be drawn

- * @param height the height of the rectangle to be drawn

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the outline of the rectangle specified by the arguments,
+ * using the receiver's foreground color. The left and right edges
+ * of the rectangle are at <code>x</code> and <code>x + width</code>. 
+ * The top and bottom edges are at <code>y</code> and <code>y + height</code>. 
+ *
+ * @param x the x coordinate of the rectangle to be drawn
+ * @param y the y coordinate of the rectangle to be drawn
+ * @param width the width of the rectangle to be drawn
+ * @param height the height of the rectangle to be drawn
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawRectangle(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -607,44 +607,44 @@ public void drawRectangle(int x, int y, int width, int height) {
 	OS.gdk_draw_rectangle(data.drawable, handle, 0, x, y, width, height);
 }
 
-/** 

- * Draws the outline of the specified rectangle, using the receiver's

- * foreground color. The left and right edges of the rectangle are at

- * <code>rect.x</code> and <code>rect.x + rect.width</code>. The top 

- * and bottom edges are at <code>rect.y</code> and 

- * <code>rect.y + rect.height</code>. 

- *

- * @param rect the rectangle to draw

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the outline of the specified rectangle, using the receiver's
+ * foreground color. The left and right edges of the rectangle are at
+ * <code>rect.x</code> and <code>rect.x + rect.width</code>. The top 
+ * and bottom edges are at <code>rect.y</code> and 
+ * <code>rect.y + rect.height</code>. 
+ *
+ * @param rect the rectangle to draw
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawRectangle(Rectangle rect) {
 	if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	drawRectangle (rect.x, rect.y, rect.width, rect.height);
 }
-/** 

- * Draws the outline of the round-cornered rectangle specified by 

- * the arguments, using the receiver's foreground color. The left and

- * right edges of the rectangle are at <code>x</code> and <code>x + width</code>. 

- * The top and bottom edges are at <code>y</code> and <code>y + height</code>.

- * The <em>roundness</em> of the corners is specified by the 

- * <code>arcWidth</code> and <code>arcHeight</code> arguments. 

- *

- * @param x the x coordinate of the rectangle to be drawn

- * @param y the y coordinate of the rectangle to be drawn

- * @param width the width of the rectangle to be drawn

- * @param height the height of the rectangle to be drawn

- * @param arcWidth the horizontal diameter of the arc at the four corners

- * @param arcHeight the vertical diameter of the arc at the four corners

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the outline of the round-cornered rectangle specified by 
+ * the arguments, using the receiver's foreground color. The left and
+ * right edges of the rectangle are at <code>x</code> and <code>x + width</code>. 
+ * The top and bottom edges are at <code>y</code> and <code>y + height</code>.
+ * The <em>roundness</em> of the corners is specified by the 
+ * <code>arcWidth</code> and <code>arcHeight</code> arguments. 
+ *
+ * @param x the x coordinate of the rectangle to be drawn
+ * @param y the y coordinate of the rectangle to be drawn
+ * @param width the width of the rectangle to be drawn
+ * @param height the height of the rectangle to be drawn
+ * @param arcWidth the horizontal diameter of the arc at the four corners
+ * @param arcHeight the vertical diameter of the arc at the four corners
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -700,46 +700,46 @@ public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth
 	}
 }
 
-/** 

- * Draws the given string, using the receiver's current font and

- * foreground color. No tab expansion or carriage return processing

- * will be performed. The background of the rectangular area where

- * the string is being drawn will be filled with the receiver's

- * background color.

- *

- * @param string the string to be drawn

- * @param x the x coordinate of the top left corner of the rectangular area where the string is to be drawn

- * @param y the y coordinate of the top left corner of the rectangular area where the string is to be drawn

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the given string, using the receiver's current font and
+ * foreground color. No tab expansion or carriage return processing
+ * will be performed. The background of the rectangular area where
+ * the string is being drawn will be filled with the receiver's
+ * background color.
+ *
+ * @param string the string to be drawn
+ * @param x the x coordinate of the top left corner of the rectangular area where the string is to be drawn
+ * @param y the y coordinate of the top left corner of the rectangular area where the string is to be drawn
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawString (String string, int x, int y) {
 	drawString(string, x, y, false);
 }
-/** 

- * Draws the given string, using the receiver's current font and

- * foreground color. No tab expansion or carriage return processing

- * will be performed. If <code>isTransparent</code> is <code>true</code>,

- * then the background of the rectangular area where the string is being

- * drawn will not be modified, otherwise it will be filled with the

- * receiver's background color.

- *

- * @param string the string to be drawn

- * @param x the x coordinate of the top left corner of the rectangular area where the string is to be drawn

- * @param y the y coordinate of the top left corner of the rectangular area where the string is to be drawn

- * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the given string, using the receiver's current font and
+ * foreground color. No tab expansion or carriage return processing
+ * will be performed. If <code>isTransparent</code> is <code>true</code>,
+ * then the background of the rectangular area where the string is being
+ * drawn will not be modified, otherwise it will be filled with the
+ * receiver's background color.
+ *
+ * @param string the string to be drawn
+ * @param x the x coordinate of the top left corner of the rectangular area where the string is to be drawn
+ * @param y the y coordinate of the top left corner of the rectangular area where the string is to be drawn
+ * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawString(String string, int x, int y, boolean isTransparent) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -751,47 +751,47 @@ public void drawString(String string, int x, int y, boolean isTransparent) {
 	OS.gdk_draw_layout(data.drawable, handle, x, y, layout);
 }
 
-/** 

- * Draws the given string, using the receiver's current font and

- * foreground color. Tab expansion and carriage return processing

- * are performed. The background of the rectangular area where

- * the text is being drawn will be filled with the receiver's

- * background color.

- *

- * @param string the string to be drawn

- * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn

- * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the given string, using the receiver's current font and
+ * foreground color. Tab expansion and carriage return processing
+ * are performed. The background of the rectangular area where
+ * the text is being drawn will be filled with the receiver's
+ * background color.
+ *
+ * @param string the string to be drawn
+ * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn
+ * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawText(String string, int x, int y) {
 	drawText(string, x, y, SWT.DRAW_DELIMITER | SWT.DRAW_TAB);
 }
 
-/** 

- * Draws the given string, using the receiver's current font and

- * foreground color. Tab expansion and carriage return processing

- * are performed. If <code>isTransparent</code> is <code>true</code>,

- * then the background of the rectangular area where the text is being

- * drawn will not be modified, otherwise it will be filled with the

- * receiver's background color.

- *

- * @param string the string to be drawn

- * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn

- * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn

- * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the given string, using the receiver's current font and
+ * foreground color. Tab expansion and carriage return processing
+ * are performed. If <code>isTransparent</code> is <code>true</code>,
+ * then the background of the rectangular area where the text is being
+ * drawn will not be modified, otherwise it will be filled with the
+ * receiver's background color.
+ *
+ * @param string the string to be drawn
+ * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn
+ * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn
+ * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawText(String string, int x, int y, boolean isTransparent) {
 	int flags = SWT.DRAW_DELIMITER | SWT.DRAW_TAB;
@@ -799,39 +799,39 @@ public void drawText(String string, int x, int y, boolean isTransparent) {
 	drawText(string, x, y, flags);
 }
 
-/** 

- * Draws the given string, using the receiver's current font and

- * foreground color. Tab expansion, line delimiter and mnemonic

- * processing are performed according to the specified flags. If

- * <code>flags</code> includes <code>DRAW_TRANSPARENT</code>,

- * then the background of the rectangular area where the text is being

- * drawn will not be modified, otherwise it will be filled with the

- * receiver's background color.

- * <p>

- * The parameter <code>flags</code> may be a combination of:

- * <dl>

- * <dt><b>DRAW_DELIMITER</b></dt>

- * <dd>draw multiple lines</dd>

- * <dt><b>DRAW_TAB</b></dt>

- * <dd>expand tabs</dd>

- * <dt><b>DRAW_MNEMONIC</b></dt>

- * <dd>underline the mnemonic character</dd>

- * <dt><b>DRAW_TRANSPARENT</b></dt>

- * <dd>transparent background</dd>

- * </dl>

- * </p>

- *

- * @param string the string to be drawn

- * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn

- * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn

- * @param flags the flags specifing how to process the text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Draws the given string, using the receiver's current font and
+ * foreground color. Tab expansion, line delimiter and mnemonic
+ * processing are performed according to the specified flags. If
+ * <code>flags</code> includes <code>DRAW_TRANSPARENT</code>,
+ * then the background of the rectangular area where the text is being
+ * drawn will not be modified, otherwise it will be filled with the
+ * receiver's background color.
+ * <p>
+ * The parameter <code>flags</code> may be a combination of:
+ * <dl>
+ * <dt><b>DRAW_DELIMITER</b></dt>
+ * <dd>draw multiple lines</dd>
+ * <dt><b>DRAW_TAB</b></dt>
+ * <dd>expand tabs</dd>
+ * <dt><b>DRAW_MNEMONIC</b></dt>
+ * <dd>underline the mnemonic character</dd>
+ * <dt><b>DRAW_TRANSPARENT</b></dt>
+ * <dd>transparent background</dd>
+ * </dl>
+ * </p>
+ *
+ * @param string the string to be drawn
+ * @param x the x coordinate of the top left corner of the rectangular area where the text is to be drawn
+ * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn
+ * @param flags the flags specifing how to process the text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void drawText (String string, int x, int y, int flags) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -843,15 +843,15 @@ public void drawText (String string, int x, int y, int flags) {
 	OS.gdk_draw_layout(data.drawable, handle, x, y, layout);
 }
 
-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
 public boolean equals(Object object) {
 	if (object == this) return true;
@@ -859,40 +859,40 @@ public boolean equals(Object object) {
 	return handle == ((GC)object).handle;
 }
 
-/**

- * Fills the interior of a circular or elliptical arc within

- * the specified rectangular area, with the receiver's background

- * color.

- * <p>

- * The resulting arc begins at <code>startAngle</code> and extends  

- * for <code>arcAngle</code> degrees, using the current color.

- * Angles are interpreted such that 0 degrees is at the 3 o'clock

- * position. A positive value indicates a counter-clockwise rotation

- * while a negative value indicates a clockwise rotation.

- * </p><p>

- * The center of the arc is the center of the rectangle whose origin 

- * 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.

- * </p>

- *

- * @param x the x coordinate of the upper-left corner of the arc to be filled

- * @param y the y coordinate of the upper-left corner of the arc to be filled

- * @param width the width of the arc to be filled

- * @param height the height of the arc to be filled

- * @param startAngle the beginning angle

- * @param arcAngle the angular extent of the arc, relative to the start angle

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if any of the width, height or endAngle is zero.</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawArc

+/**
+ * Fills the interior of a circular or elliptical arc within
+ * the specified rectangular area, with the receiver's background
+ * color.
+ * <p>
+ * The resulting arc begins at <code>startAngle</code> and extends  
+ * for <code>arcAngle</code> degrees, using the current color.
+ * Angles are interpreted such that 0 degrees is at the 3 o'clock
+ * position. A positive value indicates a counter-clockwise rotation
+ * while a negative value indicates a clockwise rotation.
+ * </p><p>
+ * The center of the arc is the center of the rectangle whose origin 
+ * 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.
+ * </p>
+ *
+ * @param x the x coordinate of the upper-left corner of the arc to be filled
+ * @param y the y coordinate of the upper-left corner of the arc to be filled
+ * @param width the width of the arc to be filled
+ * @param height the height of the arc to be filled
+ * @param startAngle the beginning angle
+ * @param arcAngle the angular extent of the arc, relative to the start angle
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if any of the width, height or endAngle is zero.</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawArc
  */
 public void fillArc(int x, int y, int width, int height, int startAngle, int endAngle) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -917,25 +917,25 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int end
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/**

- * Fills the interior of the specified rectangle with a gradient

- * sweeping from left to right or top to bottom progressing

- * from the receiver's foreground color to its background color.

- *

- * @param x the x coordinate of the rectangle to be filled

- * @param y the y coordinate of the rectangle to be filled

- * @param width the width of the rectangle to be filled, may be negative

- *        (inverts direction of gradient if horizontal)

- * @param height the height of the rectangle to be filled, may be negative

- *        (inverts direction of gradient if vertical)

- * @param vertical if true sweeps from top to bottom, else 

- *        sweeps from left to right

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawRectangle

+/**
+ * Fills the interior of the specified rectangle with a gradient
+ * sweeping from left to right or top to bottom progressing
+ * from the receiver's foreground color to its background color.
+ *
+ * @param x the x coordinate of the rectangle to be filled
+ * @param y the y coordinate of the rectangle to be filled
+ * @param width the width of the rectangle to be filled, may be negative
+ *        (inverts direction of gradient if horizontal)
+ * @param height the height of the rectangle to be filled, may be negative
+ *        (inverts direction of gradient if vertical)
+ * @param vertical if true sweeps from top to bottom, else 
+ *        sweeps from left to right
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawRectangle
  */
 public void fillGradientRectangle(int x, int y, int width, int height, boolean vertical) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -975,21 +975,21 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
 		8, 8, 8);
 }
 
-/** 

- * Fills the interior of an oval, within the specified

- * rectangular area, with the receiver's background

- * color.

- *

- * @param x the x coordinate of the upper left corner of the oval to be filled

- * @param y the y coordinate of the upper left corner of the oval to be filled

- * @param width the width of the oval to be filled

- * @param height the height of the oval to be filled

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawOval

+/** 
+ * Fills the interior of an oval, within the specified
+ * rectangular area, with the receiver's background
+ * color.
+ *
+ * @param x the x coordinate of the upper left corner of the oval to be filled
+ * @param y the y coordinate of the upper left corner of the oval to be filled
+ * @param width the width of the oval to be filled
+ * @param height the height of the oval to be filled
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawOval
  */
 public void fillOval(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1011,24 +1011,24 @@ public void fillOval(int x, int y, int width, int height) {
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/** 

- * Fills the interior of the closed polygon which is defined by the

- * specified array of integer coordinates, using the receiver's

- * background color. The array contains alternating x and y values

- * which are considered to represent points which are the vertices of

- * the polygon. Lines are drawn between each consecutive pair, and

- * between the first pair and last pair in the array.

- *

- * @param pointArray an array of alternating x and y values which are the vertices of the polygon

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawPolygon	

+/** 
+ * Fills the interior of the closed polygon which is defined by the
+ * specified array of integer coordinates, using the receiver's
+ * background color. The array contains alternating x and y values
+ * which are considered to represent points which are the vertices of
+ * the polygon. Lines are drawn between each consecutive pair, and
+ * between the first pair and last pair in the array.
+ *
+ * @param pointArray an array of alternating x and y values which are the vertices of the polygon
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawPolygon	
  */
 public void fillPolygon(int[] pointArray) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1043,20 +1043,20 @@ public void fillPolygon(int[] pointArray) {
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/** 

- * Fills the interior of the rectangle specified by the arguments,

- * using the receiver's background color. 

- *

- * @param x the x coordinate of the rectangle to be filled

- * @param y the y coordinate of the rectangle to be filled

- * @param width the width of the rectangle to be filled

- * @param height the height of the rectangle to be filled

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawRectangle

+/** 
+ * Fills the interior of the rectangle specified by the arguments,
+ * using the receiver's background color. 
+ *
+ * @param x the x coordinate of the rectangle to be filled
+ * @param y the y coordinate of the rectangle to be filled
+ * @param width the width of the rectangle to be filled
+ * @param height the height of the rectangle to be filled
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawRectangle
  */
 public void fillRectangle(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1078,20 +1078,20 @@ public void fillRectangle(int x, int y, int width, int height) {
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/** 

- * Fills the interior of the specified rectangle, using the receiver's

- * background color. 

- *

- * @param rectangle the rectangle to be filled

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawRectangle

+/** 
+ * Fills the interior of the specified rectangle, using the receiver's
+ * background color. 
+ *
+ * @param rectangle the rectangle to be filled
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawRectangle
  */
 public void fillRectangle(Rectangle rect) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1099,22 +1099,22 @@ public void fillRectangle(Rectangle rect) {
 	fillRectangle(rect.x, rect.y, rect.width, rect.height);
 }
 
-/** 

- * Fills the interior of the round-cornered rectangle specified by 

- * the arguments, using the receiver's background color. 

- *

- * @param x the x coordinate of the rectangle to be filled

- * @param y the y coordinate of the rectangle to be filled

- * @param width the width of the rectangle to be filled

- * @param height the height of the rectangle to be filled

- * @param arcWidth the horizontal diameter of the arc at the four corners

- * @param arcHeight the vertical diameter of the arc at the four corners

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #drawRoundRectangle

+/** 
+ * Fills the interior of the round-cornered rectangle specified by 
+ * the arguments, using the receiver's background color. 
+ *
+ * @param x the x coordinate of the rectangle to be filled
+ * @param y the y coordinate of the rectangle to be filled
+ * @param width the width of the rectangle to be filled
+ * @param height the height of the rectangle to be filled
+ * @param arcWidth the horizontal diameter of the arc at the four corners
+ * @param arcHeight the vertical diameter of the arc at the four corners
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #drawRoundRectangle
  */
 public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1176,20 +1176,20 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
 	OS.gdk_gc_set_foreground(handle, color);
 }
 
-/**

- * Returns the <em>advance width</em> of the specified character in

- * the font which is currently selected into the receiver.

- * <p>

- * The advance width is defined as the horizontal distance the cursor

- * should move after printing the character in the selected font.

- * </p>

- *

- * @param ch the character to measure

- * @return the distance in the x direction to move past the character before painting the next

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the <em>advance width</em> of the specified character in
+ * the font which is currently selected into the receiver.
+ * <p>
+ * The advance width is defined as the horizontal distance the cursor
+ * should move after printing the character in the selected font.
+ * </p>
+ *
+ * @param ch the character to measure
+ * @return the distance in the x direction to move past the character before painting the next
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getAdvanceWidth(char ch) {	
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1197,14 +1197,14 @@ public int getAdvanceWidth(char ch) {
 	return stringExtent(new String(new char[]{ch})).x;
 }
 
-/** 

- * Returns the background color.

- *

- * @return the receiver's background color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the background color.
+ *
+ * @return the receiver's background color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Color getBackground() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1217,21 +1217,21 @@ public Color getBackground() {
 	return Color.gtk_new(data.device, color);	
 }
 
-/**

- * Returns the width of the specified character in the font

- * selected into the receiver. 

- * <p>

- * The width is defined as the space taken up by the actual

- * character, not including the leading and tailing whitespace

- * or overhang.

- * </p>

- *

- * @param ch the character to measure

- * @return the width of the character

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the width of the specified character in the font
+ * selected into the receiver. 
+ * <p>
+ * The width is defined as the space taken up by the actual
+ * character, not including the leading and tailing whitespace
+ * or overhang.
+ * </p>
+ *
+ * @param ch the character to measure
+ * @return the width of the character
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getCharWidth(char ch) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1239,17 +1239,17 @@ public int getCharWidth(char ch) {
 	return stringExtent(new String(new char[]{ch})).x;
 }
 
-/** 

- * Returns the bounding rectangle of the receiver's clipping

- * region. If no clipping region is set, the return value

- * will be a rectangle which covers the entire bounds of the

- * object the receiver is drawing on.

- *

- * @return the bounding rectangle of the clipping region

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the bounding rectangle of the receiver's clipping
+ * region. If no clipping region is set, the return value
+ * will be a rectangle which covers the entire bounds of the
+ * object the receiver is drawing on.
+ *
+ * @return the bounding rectangle of the clipping region
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Rectangle getClipping() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1264,18 +1264,18 @@ public Rectangle getClipping() {
 	return new Rectangle(rect.x, rect.y, rect.width, rect.height);
 }
 
-/** 

- * Sets the region managed by the argument to the current

- * clipping region of the receiver.

- *

- * @param region the region to fill with the clipping region

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the region is null</li>

- * </ul>	

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Sets the region managed by the argument to the current
+ * clipping region of the receiver.
+ *
+ * @param region the region to fill with the clipping region
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the region is null</li>
+ * </ul>	
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void getClipping(Region region) {	
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1294,31 +1294,31 @@ public void getClipping(Region region) {
 	}
 	OS.gdk_region_union(hRegion, clipRgn);
 }
-/** 

- * Returns the font currently being used by the receiver

- * to draw and measure text.

- *

- * @return the receiver's font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the font currently being used by the receiver
+ * to draw and measure text.
+ *
+ * @return the receiver's font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Font getFont() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return Font.gtk_new(data.device, data.font);
 }
 
-/**

- * Returns a FontMetrics which contains information

- * about the font currently being used by the receiver

- * to draw and measure text.

- *

- * @return font metrics for the receiver's font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns a FontMetrics which contains information
+ * about the font currently being used by the receiver
+ * to draw and measure text.
+ *
+ * @return font metrics for the receiver's font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public FontMetrics getFontMetrics() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1334,14 +1334,14 @@ public FontMetrics getFontMetrics() {
 	return fm;
 }
 
-/** 

- * Returns the receiver's foreground color.

- *

- * @return the color used for drawing foreground things

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the receiver's foreground color.
+ *
+ * @return the color used for drawing foreground things
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Color getForeground() {	
 	if (handle == 0) SWT.error(SWT.ERROR_WIDGET_DISPOSED);
@@ -1354,34 +1354,34 @@ public Color getForeground() {
 	return Color.gtk_new(data.device, color);	
 }
 
-/** 

- * Returns the receiver's line style, which will be one

- * of the constants <code>SWT.LINE_SOLID</code>, <code>SWT.LINE_DASH</code>,

- * <code>SWT.LINE_DOT</code>, <code>SWT.LINE_DASHDOT</code> or

- * <code>SWT.LINE_DASHDOTDOT</code>.

- *

- * @return the style used for drawing lines

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the receiver's line style, which will be one
+ * of the constants <code>SWT.LINE_SOLID</code>, <code>SWT.LINE_DASH</code>,
+ * <code>SWT.LINE_DOT</code>, <code>SWT.LINE_DASHDOT</code> or
+ * <code>SWT.LINE_DASHDOTDOT</code>.
+ *
+ * @return the style used for drawing lines
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getLineStyle() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return data.lineStyle;
 }
 
-/** 

- * Returns the width that will be used when drawing lines

- * for all of the figure drawing operations (that is,

- * <code>drawLine</code>, <code>drawRectangle</code>, 

- * <code>drawPolyline</code>, and so forth.

- *

- * @return the receiver's line width 

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns the width that will be used when drawing lines
+ * for all of the figure drawing operations (that is,
+ * <code>drawLine</code>, <code>drawRectangle</code>, 
+ * <code>drawPolyline</code>, and so forth.
+ *
+ * @return the receiver's line width 
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public int getLineWidth() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1390,19 +1390,19 @@ public int getLineWidth() {
 	return values.line_width;
 }
 
-/** 

- * Returns <code>true</code> if this GC is drawing in the mode

- * where the resulting color in the destination is the

- * <em>exclusive or</em> of the color values in the source

- * and the destination, and <code>false</code> if it is

- * drawing in the mode where the destination color is being

- * replaced with the source color value.

- *

- * @return <code>true</code> true if the receiver is in XOR mode, and false otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Returns <code>true</code> if this GC is drawing in the mode
+ * where the resulting color in the destination is the
+ * <em>exclusive or</em> of the color values in the source
+ * and the destination, and <code>false</code> if it is
+ * drawing in the mode where the destination color is being
+ * replaced with the source color value.
+ *
+ * @return <code>true</code> true if the receiver is in XOR mode, and false otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public boolean getXORMode() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1411,19 +1411,19 @@ public boolean getXORMode() {
 	return values.function == OS.GDK_XOR;
 }
 
-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see #equals

+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see #equals
  */
 public int hashCode() {
 	return handle;
@@ -1460,53 +1460,53 @@ void init(Drawable drawable, GCData data, int gdkGC) {
 	handle = gdkGC;
 }
 
-/**

- * Returns <code>true</code> if the receiver has a clipping

- * region set into it, and <code>false</code> otherwise.

- * If this method returns false, the receiver will draw on all

- * available space in the destination. If it returns true, 

- * it will draw only in the area that is covered by the region

- * that can be accessed with <code>getClipping(region)</code>.

- *

- * @return <code>true</code> if the GC has a clipping region, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver has a clipping
+ * region set into it, and <code>false</code> otherwise.
+ * If this method returns false, the receiver will draw on all
+ * available space in the destination. If it returns true, 
+ * it will draw only in the area that is covered by the region
+ * that can be accessed with <code>getClipping(region)</code>.
+ *
+ * @return <code>true</code> if the GC has a clipping region, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public boolean isClipped() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return data.clipRgn != 0;
 }
 
-/**

- * Returns <code>true</code> if the GC has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the GC.

- * When a GC has been disposed, it is an error to

- * invoke any other method using the GC.

- *

- * @return <code>true</code> when the GC is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the GC has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the GC.
+ * When a GC has been disposed, it is an error to
+ * invoke any other method using the GC.
+ *
+ * @return <code>true</code> when the GC is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed() {
 	return handle == 0;
 }
 
-/**

- * Sets the background color. The background color is used

- * for fill operations and as the background color when text

- * is drawn.

- *

- * @param color the new background color for the receiver

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the background color. The background color is used
+ * for fill operations and as the background color when text
+ * is drawn.
+ *
+ * @param color the new background color for the receiver
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setBackground(Color color) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1515,19 +1515,19 @@ public void setBackground(Color color) {
 	OS.gdk_gc_set_background(handle, color.handle);
 }
 
-/**

- * Sets the area of the receiver which can be changed

- * by drawing operations to the rectangular area specified

- * by the arguments.

- *

- * @param x the x coordinate of the clipping rectangle

- * @param y the y coordinate of the clipping rectangle

- * @param width the width of the clipping rectangle

- * @param height the height of the clipping rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the area of the receiver which can be changed
+ * by drawing operations to the rectangular area specified
+ * by the arguments.
+ *
+ * @param x the x coordinate of the clipping rectangle
+ * @param y the y coordinate of the clipping rectangle
+ * @param width the width of the clipping rectangle
+ * @param height the height of the clipping rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setClipping(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1543,16 +1543,16 @@ public void setClipping(int x, int y, int width, int height) {
 	OS.gdk_gc_set_clip_rectangle(handle, rect);
 	OS.gdk_region_union_with_rect(clipRgn, rect);
 }
-/**

- * Sets the area of the receiver which can be changed

- * by drawing operations to the rectangular area specified

- * by the argument.

- *

- * @param rect the clipping rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the area of the receiver which can be changed
+ * by drawing operations to the rectangular area specified
+ * by the argument.
+ *
+ * @param rect the clipping rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setClipping(Rectangle rect) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1567,16 +1567,16 @@ public void setClipping(Rectangle rect) {
 	}
 	setClipping (rect.x, rect.y, rect.width, rect.height);
 }
-/**

- * Sets the area of the receiver which can be changed

- * by drawing operations to the region specified

- * by the argument.

- *

- * @param rect the clipping region.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the area of the receiver which can be changed
+ * by drawing operations to the region specified
+ * by the argument.
+ *
+ * @param rect the clipping region.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setClipping(Region region) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1598,20 +1598,20 @@ public void setClipping(Region region) {
 	}
 }
 
-/** 

- * Sets the font which will be used by the receiver

- * to draw and measure text to the argument. If the

- * argument is null, then a default font appropriate

- * for the platform will be used instead.

- *

- * @param font the new font for the receiver, or null to indicate a default font

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Sets the font which will be used by the receiver
+ * to draw and measure text to the argument. If the
+ * argument is null, then a default font appropriate
+ * for the platform will be used instead.
+ *
+ * @param font the new font for the receiver, or null to indicate a default font
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setFont(Font font) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1621,19 +1621,19 @@ public void setFont(Font font) {
 	OS.pango_layout_set_font_description(data.layout, fontHandle);
 }
 
-/**

- * Sets the foreground color. The foreground color is used

- * for drawing operations including when text is drawn.

- *

- * @param color the new foreground color for the receiver

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the foreground color. The foreground color is used
+ * for drawing operations including when text is drawn.
+ *
+ * @param color the new foreground color for the receiver
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setForeground(Color color) {	
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1642,17 +1642,17 @@ public void setForeground(Color color) {
 	OS.gdk_gc_set_foreground(handle, color.handle);
 }
 
-/** 

- * Sets the receiver's line style to the argument, which must be one

- * of the constants <code>SWT.LINE_SOLID</code>, <code>SWT.LINE_DASH</code>,

- * <code>SWT.LINE_DOT</code>, <code>SWT.LINE_DASHDOT</code> or

- * <code>SWT.LINE_DASHDOTDOT</code>.

- *

- * @param lineStyle the style to be used for drawing lines

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Sets the receiver's line style to the argument, which must be one
+ * of the constants <code>SWT.LINE_SOLID</code>, <code>SWT.LINE_DASH</code>,
+ * <code>SWT.LINE_DOT</code>, <code>SWT.LINE_DASHDOT</code> or
+ * <code>SWT.LINE_DASHDOTDOT</code>.
+ *
+ * @param lineStyle the style to be used for drawing lines
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setLineStyle(int lineStyle) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1680,17 +1680,17 @@ public void setLineStyle(int lineStyle) {
 	OS.gdk_gc_set_line_attributes(handle, 0, OS.GDK_LINE_ON_OFF_DASH, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
 }
 
-/** 

- * Sets the width that will be used when drawing lines

- * for all of the figure drawing operations (that is,

- * <code>drawLine</code>, <code>drawRectangle</code>, 

- * <code>drawPolyline</code>, and so forth.

- *

- * @param lineWidth the width of a line

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * Sets the width that will be used when drawing lines
+ * for all of the figure drawing operations (that is,
+ * <code>drawLine</code>, <code>drawRectangle</code>, 
+ * <code>drawPolyline</code>, and so forth.
+ *
+ * @param lineWidth the width of a line
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setLineWidth(int width) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1701,43 +1701,43 @@ public void setLineWidth(int width) {
 	}
 }
 
-/** 

- * If the argument is <code>true</code>, puts the receiver

- * in a drawing mode where the resulting color in the destination

- * is the <em>exclusive or</em> of the color values in the source

- * and the destination, and if the argument is <code>false</code>,

- * puts the receiver in a drawing mode where the destination color

- * is replaced with the source color value.

- *

- * @param xor if <code>true</code>, then <em>xor</em> mode is used, otherwise <em>source copy</em> mode is used

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/** 
+ * If the argument is <code>true</code>, puts the receiver
+ * in a drawing mode where the resulting color in the destination
+ * is the <em>exclusive or</em> of the color values in the source
+ * and the destination, and if the argument is <code>false</code>,
+ * puts the receiver in a drawing mode where the destination color
+ * is replaced with the source color value.
+ *
+ * @param xor if <code>true</code>, then <em>xor</em> mode is used, otherwise <em>source copy</em> mode is used
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setXORMode(boolean val) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	OS.gdk_gc_set_function(handle, val ? OS.GDK_XOR : OS.GDK_COPY);
 }
 
-/**

- * Returns the extent of the given string. No tab

- * expansion or carriage return processing will be performed.

- * <p>

- * The <em>extent</em> of a string is the width and height of

- * the rectangular area it would cover if drawn in a particular

- * font (in this case, the current font in the receiver).

- * </p>

- *

- * @param string the string to measure

- * @return a point containing the extent of the string

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the extent of the given string. No tab
+ * expansion or carriage return processing will be performed.
+ * <p>
+ * The <em>extent</em> of a string is the width and height of
+ * the rectangular area it would cover if drawn in a particular
+ * font (in this case, the current font in the receiver).
+ * </p>
+ *
+ * @param string the string to measure
+ * @return a point containing the extent of the string
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Point stringExtent(String string) {	
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1752,59 +1752,59 @@ public Point stringExtent(String string) {
 	return new Point(OS.PANGO_PIXELS(width[0]), OS.PANGO_PIXELS(height[0]));
 }
 
-/**

- * Returns the extent of the given string. Tab expansion and

- * carriage return processing are performed.

- * <p>

- * The <em>extent</em> of a string is the width and height of

- * the rectangular area it would cover if drawn in a particular

- * font (in this case, the current font in the receiver).

- * </p>

- *

- * @param string the string to measure

- * @return a point containing the extent of the string

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the extent of the given string. Tab expansion and
+ * carriage return processing are performed.
+ * <p>
+ * The <em>extent</em> of a string is the width and height of
+ * the rectangular area it would cover if drawn in a particular
+ * font (in this case, the current font in the receiver).
+ * </p>
+ *
+ * @param string the string to measure
+ * @return a point containing the extent of the string
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Point textExtent(String string) {
 	return textExtent(string, SWT.DRAW_DELIMITER | SWT.DRAW_TAB);
 }
 
-/**

- * Returns the extent of the given string. Tab expansion, line

- * delimiter and mnemonic processing are performed according to

- * the specified flags, which can be a combination of:

- * <dl>

- * <dt><b>DRAW_DELIMITER</b></dt>

- * <dd>draw multiple lines</dd>

- * <dt><b>DRAW_TAB</b></dt>

- * <dd>expand tabs</dd>

- * <dt><b>DRAW_MNEMONIC</b></dt>

- * <dd>underline the mnemonic character</dd>

- * <dt><b>DRAW_TRANSPARENT</b></dt>

- * <dd>transparent background</dd>

- * </dl>

- * <p>

- * The <em>extent</em> of a string is the width and height of

- * the rectangular area it would cover if drawn in a particular

- * font (in this case, the current font in the receiver).

- * </p>

- *

- * @param string the string to measure

- * @param flags the flags specifing how to process the text

- * @return a point containing the extent of the string

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the extent of the given string. Tab expansion, line
+ * delimiter and mnemonic processing are performed according to
+ * the specified flags, which can be a combination of:
+ * <dl>
+ * <dt><b>DRAW_DELIMITER</b></dt>
+ * <dd>draw multiple lines</dd>
+ * <dt><b>DRAW_TAB</b></dt>
+ * <dd>expand tabs</dd>
+ * <dt><b>DRAW_MNEMONIC</b></dt>
+ * <dd>underline the mnemonic character</dd>
+ * <dt><b>DRAW_TRANSPARENT</b></dt>
+ * <dd>transparent background</dd>
+ * </dl>
+ * <p>
+ * The <em>extent</em> of a string is the width and height of
+ * the rectangular area it would cover if drawn in a particular
+ * font (in this case, the current font in the receiver).
+ * </p>
+ *
+ * @param string the string to measure
+ * @param flags the flags specifing how to process the text
+ * @return a point containing the extent of the string
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Point textExtent(String string, int flags) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -1819,11 +1819,11 @@ public Point textExtent(String string, int flags) {
 	return new Point(OS.PANGO_PIXELS(width[0]), OS.PANGO_PIXELS(height[0]));
 }
 
-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
 public String toString () {
 	if (isDisposed()) return "GC {*DISPOSED*}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
index e3fd3d689c..620d611c0f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
@@ -1,36 +1,36 @@
-package org.eclipse.swt.graphics;

-

-/*

+package org.eclipse.swt.graphics;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.*;

-

-/**

- * Instances of this class are descriptions of GCs in terms

- * of unallocated platform-specific data fields.

- * <p>

- * <b>IMPORTANT:</b> This class is <em>not</em> part of the public

- * API for SWT. It is marked public only so that it can be shared

- * within the packages provided by SWT. It is not available on all

- * platforms, and should never be called from application code.

- * </p>

- *

- * @private

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public final class GCData {

-	public Device device;

-	public Image image;

-	public int drawable;

-	public GdkColor foreground;

-	public GdkColor background;

-	public int font;

-	public int context;

-	public int layout;

-	public int clipRgn;

-	public int lineStyle = SWT.LINE_SOLID;

+
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.*;
+
+/**
+ * Instances of this class are descriptions of GCs in terms
+ * of unallocated platform-specific data fields.
+ * <p>
+ * <b>IMPORTANT:</b> This class is <em>not</em> part of the public
+ * API for SWT. It is marked public only so that it can be shared
+ * within the packages provided by SWT. It is not available on all
+ * platforms, and should never be called from application code.
+ * </p>
+ *
+ * @private
+ */
+public final class GCData {
+	public Device device;
+	public Image image;
+	public int drawable;
+	public GdkColor foreground;
+	public GdkColor background;
+	public int font;
+	public int context;
+	public int layout;
+	public int clipRgn;
+	public int lineStyle = SWT.LINE_SOLID;
 }
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 ae7658aae8..871e2b6e57 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
@@ -11,58 +11,58 @@ import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.*;
 import java.io.*;
  
-/**

- * Instances of this class are graphics which have been prepared

- * for display on a specific device. That is, they are ready

- * to paint using methods such as <code>GC.drawImage()</code>

- * and display on widgets with, for example, <code>Button.setImage()</code>.

- * <p>

- * If loaded from a file format that supports it, an

- * <code>Image</code> may have transparency, meaning that certain

- * pixels are specified as being transparent when drawn. Examples

- * of file formats that support transparency are GIF and PNG.

- * </p><p>

- * There are two primary ways to use <code>Images</code>. 

- * The first is to load a graphic file from disk and create an

- * <code>Image</code> from it. This is done using an <code>Image</code>

- * constructor, for example:

- * <pre>

- *    Image i = new Image(device, "C:\\graphic.bmp");

- * </pre>

- * A graphic file may contain a color table specifying which

- * colors the image was intended to possess. In the above example,

- * these colors will be mapped to the closest available color in

- * SWT. It is possible to get more control over the mapping of

- * colors as the image is being created, using code of the form:

- * <pre>

- *    ImageData data = new ImageData("C:\\graphic.bmp"); 

- *    RGB[] rgbs = data.getRGBs(); 

- *    // At this point, rgbs contains specifications of all

- *    // the colors contained within this image. You may

- *    // allocate as many of these colors as you wish by

- *    // using the Color constructor Color(RGB), then

- *    // create the image:

- *    Image i = new Image(device, data);

- * </pre>

- * <p>

- * Applications which require even greater control over the image

- * loading process should use the support provided in class

- * <code>ImageLoader</code>.

- * </p><p>

- * Application code must explicitely invoke the <code>Image.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required.

- * </p>

- *

- * @see Color

- * @see ImageData

- * @see ImageLoader

+/**
+ * Instances of this class are graphics which have been prepared
+ * for display on a specific device. That is, they are ready
+ * to paint using methods such as <code>GC.drawImage()</code>
+ * and display on widgets with, for example, <code>Button.setImage()</code>.
+ * <p>
+ * If loaded from a file format that supports it, an
+ * <code>Image</code> may have transparency, meaning that certain
+ * pixels are specified as being transparent when drawn. Examples
+ * of file formats that support transparency are GIF and PNG.
+ * </p><p>
+ * There are two primary ways to use <code>Images</code>. 
+ * The first is to load a graphic file from disk and create an
+ * <code>Image</code> from it. This is done using an <code>Image</code>
+ * constructor, for example:
+ * <pre>
+ *    Image i = new Image(device, "C:\\graphic.bmp");
+ * </pre>
+ * A graphic file may contain a color table specifying which
+ * colors the image was intended to possess. In the above example,
+ * these colors will be mapped to the closest available color in
+ * SWT. It is possible to get more control over the mapping of
+ * colors as the image is being created, using code of the form:
+ * <pre>
+ *    ImageData data = new ImageData("C:\\graphic.bmp"); 
+ *    RGB[] rgbs = data.getRGBs(); 
+ *    // At this point, rgbs contains specifications of all
+ *    // the colors contained within this image. You may
+ *    // allocate as many of these colors as you wish by
+ *    // using the Color constructor Color(RGB), then
+ *    // create the image:
+ *    Image i = new Image(device, data);
+ * </pre>
+ * <p>
+ * Applications which require even greater control over the image
+ * loading process should use the support provided in class
+ * <code>ImageLoader</code>.
+ * </p><p>
+ * Application code must explicitely invoke the <code>Image.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required.
+ * </p>
+ *
+ * @see Color
+ * @see ImageData
+ * @see ImageLoader
  */
 public final class Image implements Drawable{
 
-	/**

-	 * specifies whether the receiver is a bitmap or an icon

-	 * (one of <code>SWT.BITMAP</code>, <code>SWT.ICON</code>)

+	/**
+	 * specifies whether the receiver is a bitmap or an icon
+	 * (one of <code>SWT.BITMAP</code>, <code>SWT.ICON</code>)
 	 */
 	public int type;
 	
@@ -116,35 +116,35 @@ public final class Image implements Drawable{
 Image() {
 }
 
-/**

- * Constructs an empty instance of this class with the

- * specified width and height. The result may be drawn upon

- * by creating a GC and using any of its drawing operations,

- * as shown in the following example:

- * <pre>

- *    Image i = new Image(device, width, height);

- *    GC gc = new GC(i);

- *    gc.drawRectangle(0, 0, 50, 50);

- *    gc.dispose();

- * </pre>

- * <p>

- * Note: Some platforms may have a limitation on the size

- * of image that can be created (size depends on width, height,

- * and depth). For example, Windows 95, 98, and ME do not allow

- * images larger than 16M.

- * </p>

- *

- * @param device the device on which to create the image

- * @param width the width of the new image

- * @param height the height of the new image

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_INVALID_ARGUMENT - if either the width or height is negative or zero</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an empty instance of this class with the
+ * specified width and height. The result may be drawn upon
+ * by creating a GC and using any of its drawing operations,
+ * as shown in the following example:
+ * <pre>
+ *    Image i = new Image(device, width, height);
+ *    GC gc = new GC(i);
+ *    gc.drawRectangle(0, 0, 50, 50);
+ *    gc.dispose();
+ * </pre>
+ * <p>
+ * Note: Some platforms may have a limitation on the size
+ * of image that can be created (size depends on width, height,
+ * and depth). For example, Windows 95, 98, and ME do not allow
+ * images larger than 16M.
+ * </p>
+ *
+ * @param device the device on which to create the image
+ * @param width the width of the new image
+ * @param height the height of the new image
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if either the width or height is negative or zero</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, int width, int height) {
 	if (device == null) device = Device.getDevice();
@@ -153,36 +153,36 @@ public Image(Device device, int width, int height) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs a new instance of this class based on the

- * provided image, with an appearance that varies depending

- * on the value of the flag. The possible flag values are:

- * <dl>

- * <dt><b>IMAGE_COPY</b></dt>

- * <dd>the result is an identical copy of srcImage</dd>

- * <dt><b>IMAGE_DISABLE</b></dt>

- * <dd>the result is a copy of srcImage which has a <em>disabled</em> look</dd>

- * <dt><b>IMAGE_GRAY</b></dt>

- * <dd>the result is a copy of srcImage which has a <em>gray scale</em> look</dd>

- * </dl>

- *

- * @param device the device on which to create the image

- * @param srcImage the image to use as the source

- * @param flag the style, either <code>IMAGE_COPY</code>, <code>IMAGE_DISABLE</code> or <code>IMAGE_GRAY</code>

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if srcImage is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the flag is not one of <code>IMAGE_COPY</code>, <code>IMAGE_DISABLE</code> or <code>IMAGE_GRAY</code></li>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon, or

- *          is otherwise in an invalid state</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs a new instance of this class based on the
+ * provided image, with an appearance that varies depending
+ * on the value of the flag. The possible flag values are:
+ * <dl>
+ * <dt><b>IMAGE_COPY</b></dt>
+ * <dd>the result is an identical copy of srcImage</dd>
+ * <dt><b>IMAGE_DISABLE</b></dt>
+ * <dd>the result is a copy of srcImage which has a <em>disabled</em> look</dd>
+ * <dt><b>IMAGE_GRAY</b></dt>
+ * <dd>the result is a copy of srcImage which has a <em>gray scale</em> look</dd>
+ * </dl>
+ *
+ * @param device the device on which to create the image
+ * @param srcImage the image to use as the source
+ * @param flag the style, either <code>IMAGE_COPY</code>, <code>IMAGE_DISABLE</code> or <code>IMAGE_GRAY</code>
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if srcImage is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the flag is not one of <code>IMAGE_COPY</code>, <code>IMAGE_DISABLE</code> or <code>IMAGE_GRAY</code></li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon, or
+ *          is otherwise in an invalid state</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, Image srcImage, int flag) {
 	if (device == null) device = Device.getDevice();
@@ -322,35 +322,35 @@ public Image(Device device, Image srcImage, int flag) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs an empty instance of this class with the

- * width and height of the specified rectangle. The result

- * may be drawn upon by creating a GC and using any of its

- * drawing operations, as shown in the following example:

- * <pre>

- *    Image i = new Image(device, boundsRectangle);

- *    GC gc = new GC(i);

- *    gc.drawRectangle(0, 0, 50, 50);

- *    gc.dispose();

- * </pre>

- * <p>

- * Note: Some platforms may have a limitation on the size

- * of image that can be created (size depends on width, height,

- * and depth). For example, Windows 95, 98, and ME do not allow

- * images larger than 16M.

- * </p>

- *

- * @param device the device on which to create the image

- * @param bounds a rectangle specifying the image's width and height (must not be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the bounds rectangle is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if either the rectangle's width or height is negative</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an empty instance of this class with the
+ * width and height of the specified rectangle. The result
+ * may be drawn upon by creating a GC and using any of its
+ * drawing operations, as shown in the following example:
+ * <pre>
+ *    Image i = new Image(device, boundsRectangle);
+ *    GC gc = new GC(i);
+ *    gc.drawRectangle(0, 0, 50, 50);
+ *    gc.dispose();
+ * </pre>
+ * <p>
+ * Note: Some platforms may have a limitation on the size
+ * of image that can be created (size depends on width, height,
+ * and depth). For example, Windows 95, 98, and ME do not allow
+ * images larger than 16M.
+ * </p>
+ *
+ * @param device the device on which to create the image
+ * @param bounds a rectangle specifying the image's width and height (must not be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the bounds rectangle is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if either the rectangle's width or height is negative</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, Rectangle bounds) {
 	if (device == null) device = Device.getDevice();
@@ -360,20 +360,20 @@ public Image(Device device, Rectangle bounds) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs an instance of this class from the given

- * <code>ImageData</code>.

- *

- * @param device the device on which to create the image

- * @param data the image data to create the image from (must not be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the image data is null</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an instance of this class from the given
+ * <code>ImageData</code>.
+ *
+ * @param device the device on which to create the image
+ * @param data the image data to create the image from (must not be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the image data is null</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, ImageData data) {
 	if (device == null) device = Device.getDevice();
@@ -382,34 +382,34 @@ public Image(Device device, ImageData data) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs an instance of this class, whose type is 

- * <code>SWT.ICON</code>, from the two given <code>ImageData</code>

- * objects. The two images must be the same size, and the mask image

- * must have a color depth of 1. Pixel transparency in either image

- * will be ignored. If either image is an icon to begin with, an

- * exception is thrown.

- * <p>

- * The mask image should contain white wherever the icon is to be visible,

- * and black wherever the icon is to be transparent. In addition,

- * the source image should contain black wherever the icon is to be

- * transparent.

- * </p>

- *

- * @param device the device on which to create the icon

- * @param source the color data for the icon

- * @param mask the mask data for the icon

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if either the source or mask is null </li>

- *    <li>ERROR_INVALID_ARGUMENT - if source and mask are different sizes or

- *          if the mask is not monochrome, or if either the source or mask

- *          is already an icon</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an instance of this class, whose type is 
+ * <code>SWT.ICON</code>, from the two given <code>ImageData</code>
+ * objects. The two images must be the same size, and the mask image
+ * must have a color depth of 1. Pixel transparency in either image
+ * will be ignored. If either image is an icon to begin with, an
+ * exception is thrown.
+ * <p>
+ * The mask image should contain white wherever the icon is to be visible,
+ * and black wherever the icon is to be transparent. In addition,
+ * the source image should contain black wherever the icon is to be
+ * transparent.
+ * </p>
+ *
+ * @param device the device on which to create the icon
+ * @param source the color data for the icon
+ * @param mask the mask data for the icon
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if either the source or mask is null </li>
+ *    <li>ERROR_INVALID_ARGUMENT - if source and mask are different sizes or
+ *          if the mask is not monochrome, or if either the source or mask
+ *          is already an icon</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, ImageData source, ImageData mask) {
 	if (device == null) device = Device.getDevice();
@@ -427,37 +427,37 @@ public Image(Device device, ImageData source, ImageData mask) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs an instance of this class by loading its representation

- * from the specified input stream. Throws an error if an error

- * occurs while loading the image, or if the result is an image

- * of an unsupported type.

- * <p>

- * This constructor is provided for convenience when loading a single

- * image only. If the stream contains multiple images, only the first

- * one will be loaded. To load multiple images, use 

- * <code>ImageLoader.load()</code>.

- * </p><p>

- * This constructor may be used to load a resource as follows:

- * </p>

- * <pre>

- *     new Image(device, clazz.getResourceAsStream("file.gif"));

- * </pre>

- *

- * @param device the device on which to create the image

- * @param stream the input stream to load the image from

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data </li>

- *    <li>ERROR_IO - if an IO error occurs while reading data</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an instance of this class by loading its representation
+ * from the specified input stream. Throws an error if an error
+ * occurs while loading the image, or if the result is an image
+ * of an unsupported type.
+ * <p>
+ * This constructor is provided for convenience when loading a single
+ * image only. If the stream contains multiple images, only the first
+ * one will be loaded. To load multiple images, use 
+ * <code>ImageLoader.load()</code>.
+ * </p><p>
+ * This constructor may be used to load a resource as follows:
+ * </p>
+ * <pre>
+ *     new Image(device, clazz.getResourceAsStream("file.gif"));
+ * </pre>
+ *
+ * @param device the device on which to create the image
+ * @param stream the input stream to load the image from
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data </li>
+ *    <li>ERROR_IO - if an IO error occurs while reading data</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, InputStream stream) {
 	if (device == null) device = Device.getDevice();
@@ -466,30 +466,30 @@ public Image(Device device, InputStream stream) {
 	if (device.tracking) device.new_Object(this);
 }
 
-/**

- * Constructs an instance of this class by loading its representation

- * from the file with the specified name. Throws an error if an error

- * occurs while loading the image, or if the result is an image

- * of an unsupported type.

- * <p>

- * This constructor is provided for convenience when loading

- * a single image only. If the specified file contains

- * multiple images, only the first one will be used.

- *

- * @param device the device on which to create the image

- * @param filename the name of the file to load the image from

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>

- *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data </li>

- *    <li>ERROR_IO - if an IO error occurs while reading data</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>

- * </ul>

+/**
+ * Constructs an instance of this class by loading its representation
+ * from the file with the specified name. Throws an error if an error
+ * occurs while loading the image, or if the result is an image
+ * of an unsupported type.
+ * <p>
+ * This constructor is provided for convenience when loading
+ * a single image only. If the specified file contains
+ * multiple images, only the first one will be used.
+ *
+ * @param device the device on which to create the image
+ * @param filename the name of the file to load the image from
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data </li>
+ *    <li>ERROR_IO - if an IO error occurs while reading data</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
+ * </ul>
  */
 public Image(Device device, String filename) {
 	if (device == null) device = Device.getDevice();
@@ -525,10 +525,10 @@ void destroyMask() {
 	mask = 0;
 }
 
-/**

- * Disposes of the operating system resources associated with

- * the image. Applications must dispose of all images which

- * they allocate.

+/**
+ * Disposes of the operating system resources associated with
+ * the image. Applications must dispose of all images which
+ * they allocate.
  */
 public void dispose () {
 	if (pixmap == 0) return;
@@ -541,15 +541,15 @@ public void dispose () {
 	device = null;
 }
 
-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
 public boolean equals (Object object) {
 	if (object == this) return true;
@@ -558,23 +558,23 @@ public boolean equals (Object object) {
 	return device == image.device && pixmap == image.pixmap;
 }
 
-/**

- * Returns the color to which to map the transparent pixel, or null if

- * the receiver has no transparent pixel.

- * <p>

- * There are certain uses of Images that do not support transparency

- * (for example, setting an image into a button or label). In these cases,

- * it may be desired to simulate transparency by using the background

- * color of the widget to paint the transparent pixels of the image.

- * Use this method to check which color will be used in these cases

- * in place of transparency. This value may be set with setBackground().

- * <p>

- *

- * @return the background color of the image, or null if there is no transparency in the image

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Returns the color to which to map the transparent pixel, or null if
+ * the receiver has no transparent pixel.
+ * <p>
+ * There are certain uses of Images that do not support transparency
+ * (for example, setting an image into a button or label). In these cases,
+ * it may be desired to simulate transparency by using the background
+ * color of the widget to paint the transparent pixels of the image.
+ * Use this method to check which color will be used in these cases
+ * in place of transparency. This value may be set with setBackground().
+ * <p>
+ *
+ * @return the background color of the image, or null if there is no transparency in the image
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public Color getBackground() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -583,17 +583,17 @@ public Color getBackground() {
 	return null;
 }
 
-/**

- * Returns the bounds of the receiver. The rectangle will always

- * have x and y values of 0, and the width and height of the

- * image.

- *

- * @return a rectangle specifying the image's bounds

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon</li>

- * </ul>

+/**
+ * Returns the bounds of the receiver. The rectangle will always
+ * have x and y values of 0, and the width and height of the
+ * image.
+ *
+ * @return a rectangle specifying the image's bounds
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon</li>
+ * </ul>
  */
 public Rectangle getBounds() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -602,19 +602,19 @@ public Rectangle getBounds() {
 	return new Rectangle(0, 0, width[0], height[0]);
 }
 
-/**

- * Returns an <code>ImageData</code> based on the receiver

- * Modifications made to this <code>ImageData</code> will not

- * affect the Image.

- *

- * @return an <code>ImageData</code> containing the image's data and attributes

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon</li>

- * </ul>

- *

- * @see ImageData

+/**
+ * Returns an <code>ImageData</code> based on the receiver
+ * Modifications made to this <code>ImageData</code> will not
+ * affect the Image.
+ *
+ * @return an <code>ImageData</code> containing the image's data and attributes
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon</li>
+ * </ul>
+ *
+ * @see ImageData
  */
 public ImageData getImageData() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -693,15 +693,15 @@ public static Image gtk_new(Device device, int type, int pixmap, int mask) {
 	return image;
 }
 
-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @see #equals

+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
  */
 public int hashCode () {
 	return pixmap;
@@ -838,20 +838,20 @@ void init(Device device, ImageData image) {
 	this.pixmap = pixmap;
 }
 
-/**	 

- * Invokes platform specific functionality to allocate a new GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Image</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param data the platform specific GC data 

- * @return the platform specific GC handle

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to allocate a new GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Image</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param data the platform specific GC data 
+ * @return the platform specific GC handle
+ *
+ * @private
  */
 public int internal_new_GC (GCData data) {
 	if (pixmap == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -868,72 +868,72 @@ public int internal_new_GC (GCData data) {
 	return gdkGC;
 }
 
-/**	 

- * Invokes platform specific functionality to dispose a GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Image</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param handle the platform specific GC handle

- * @param data the platform specific GC data 

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to dispose a GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Image</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param handle the platform specific GC handle
+ * @param data the platform specific GC data 
+ *
+ * @private
  */
 public void internal_dispose_GC (int gdkGC, GCData data) {
 	OS.g_object_unref(gdkGC);
 }
 
-/**

- * Returns <code>true</code> if the image has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the image.

- * When an image has been disposed, it is an error to

- * invoke any other method using the image.

- *

- * @return <code>true</code> when the image is disposed and <code>false</code> otherwise

+/**
+ * Returns <code>true</code> if the image has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the image.
+ * When an image has been disposed, it is an error to
+ * invoke any other method using the image.
+ *
+ * @return <code>true</code> when the image is disposed and <code>false</code> otherwise
  */
 public boolean isDisposed() {
 	return pixmap == 0;
 }
 
-/**

- * Sets the color to which to map the transparent pixel.

- * <p>

- * There are certain uses of <code>Images</code> that do not support

- * transparency (for example, setting an image into a button or label).

- * In these cases, it may be desired to simulate transparency by using

- * the background color of the widget to paint the transparent pixels

- * of the image. This method specifies the color that will be used in

- * these cases. For example:

- * <pre>

- *    Button b = new Button();

- *    image.setBackground(b.getBackground());>

- *    b.setImage(image);

- * </pre>

- * </p><p>

- * The image may be modified by this operation (in effect, the

- * transparent regions may be filled with the supplied color).  Hence

- * this operation is not reversible and it is not legal to call

- * this function twice or with a null argument.

- * </p><p>

- * This method has no effect if the receiver does not have a transparent

- * pixel value.

- * </p>

- *

- * @param color the color to use when a transparent pixel is specified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+/**
+ * Sets the color to which to map the transparent pixel.
+ * <p>
+ * There are certain uses of <code>Images</code> that do not support
+ * transparency (for example, setting an image into a button or label).
+ * In these cases, it may be desired to simulate transparency by using
+ * the background color of the widget to paint the transparent pixels
+ * of the image. This method specifies the color that will be used in
+ * these cases. For example:
+ * <pre>
+ *    Button b = new Button();
+ *    image.setBackground(b.getBackground());>
+ *    b.setImage(image);
+ * </pre>
+ * </p><p>
+ * The image may be modified by this operation (in effect, the
+ * transparent regions may be filled with the supplied color).  Hence
+ * this operation is not reversible and it is not legal to call
+ * this function twice or with a null argument.
+ * </p><p>
+ * This method has no effect if the receiver does not have a transparent
+ * pixel value.
+ * </p>
+ *
+ * @param color the color to use when a transparent pixel is specified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the color is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the color has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
 public void setBackground(Color color) {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -943,11 +943,11 @@ public void setBackground(Color color) {
 	//NOT DONE
 }
 
-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
 public String toString () {
 	if (isDisposed()) return "Image {*DISPOSED*}";
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
index bed035b3c6..7cd5011b3c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
@@ -1,283 +1,283 @@
-package org.eclipse.swt.graphics;

-

-/*

+package org.eclipse.swt.graphics;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.*;

-

-/**

- * Instances of this class represent areas of an x-y coordinate

- * system that are aggregates of the areas covered by a number

- * of rectangles.

- * <p>

- * Application code must explicitly invoke the <code>Region.dispose()</code> 

- * method to release the operating system resources managed by each instance

- * when those instances are no longer required.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public final class Region {

-	/**

-	 * the OS resource for the region

-	 * (Warning: This field is platform dependent)

+
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.*;
+
+/**
+ * Instances of this class represent areas of an x-y coordinate
+ * system that are aggregates of the areas covered by a number
+ * of rectangles.
+ * <p>
+ * Application code must explicitly invoke the <code>Region.dispose()</code> 
+ * method to release the operating system resources managed by each instance
+ * when those instances are no longer required.
+ * </p>
+ */
+public final class Region {
+	/**
+	 * the OS resource for the region
+	 * (Warning: This field is platform dependent)
 	 */
-	public int handle;

-

-/**

- * Constructs a new empty region.

- * 

- * @exception SWTError <ul>

- *    <li>ERROR_NO_HANDLES if a handle could not be obtained for region creation</li>

- * </ul>

+	public int handle;
+
+/**
+ * Constructs a new empty region.
+ * 
+ * @exception SWTError <ul>
+ *    <li>ERROR_NO_HANDLES if a handle could not be obtained for region creation</li>
+ * </ul>
  */
-public Region() {

-	handle = OS.gdk_region_new();

-}

-

-Region(int handle) {

-	this.handle = handle;

-}

-

-/**

- * Adds the given rectangle to the collection of rectangles

- * the receiver maintains to describe its area.

- *

- * @param rect the rectangle to merge with the receiver

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the rectangle's width or height is negative</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+public Region() {
+	handle = OS.gdk_region_new();
+}
+
+Region(int handle) {
+	this.handle = handle;
+}
+
+/**
+ * Adds the given rectangle to the collection of rectangles
+ * the receiver maintains to describe its area.
+ *
+ * @param rect the rectangle to merge with the receiver
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the rectangle's width or height is negative</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
-public void add(Rectangle rect) {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	if (rect.width < 0 || rect.height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	GdkRectangle gdkRect = new GdkRectangle();

-	gdkRect.x = rect.x;

-	gdkRect.y = rect.y;

-	gdkRect.width = rect.width;

-	gdkRect.height = rect.height;

-	OS.gdk_region_union_with_rect(handle, gdkRect);

-}

-

-/**

- * Adds all of the rectangles which make up the area covered

- * by the argument to the collection of rectangles the receiver

- * maintains to describe its area.

- *

- * @param region the region to merge

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+public void add(Rectangle rect) {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	if (rect.width < 0 || rect.height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	GdkRectangle gdkRect = new GdkRectangle();
+	gdkRect.x = rect.x;
+	gdkRect.y = rect.y;
+	gdkRect.width = rect.width;
+	gdkRect.height = rect.height;
+	OS.gdk_region_union_with_rect(handle, gdkRect);
+}
+
+/**
+ * Adds all of the rectangles which make up the area covered
+ * by the argument to the collection of rectangles the receiver
+ * maintains to describe its area.
+ *
+ * @param region the region to merge
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
-public void add(Region region) {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);

-	OS.gdk_region_union(handle, region.handle);

-}

-

-/**

- * Returns <code>true</code> if the point specified by the

- * arguments is inside the area specified by the receiver,

- * and <code>false</code> otherwise.

- *

- * @param x the x coordinate of the point to test for containment

- * @param y the y coordinate of the point to test for containment

- * @return <code>true</code> if the region contains the point and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+public void add(Region region) {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+	OS.gdk_region_union(handle, region.handle);
+}
+
+/**
+ * Returns <code>true</code> if the point specified by the
+ * arguments is inside the area specified by the receiver,
+ * and <code>false</code> otherwise.
+ *
+ * @param x the x coordinate of the point to test for containment
+ * @param y the y coordinate of the point to test for containment
+ * @return <code>true</code> if the region contains the point and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
-public boolean contains(int x, int y) {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	return OS.gdk_region_point_in(handle, x, y);

-}

-

-/**

- * Returns <code>true</code> if the given point is inside the

- * area specified by the receiver, and <code>false</code>

- * otherwise.

- *

- * @param pt the point to test for containment

- * @return <code>true</code> if the region contains the point and <code>false</code> otherwise

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+public boolean contains(int x, int y) {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	return OS.gdk_region_point_in(handle, x, y);
+}
+
+/**
+ * Returns <code>true</code> if the given point is inside the
+ * area specified by the receiver, and <code>false</code>
+ * otherwise.
+ *
+ * @param pt the point to test for containment
+ * @return <code>true</code> if the region contains the point and <code>false</code> otherwise
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
-public boolean contains(Point pt) {

-	if (pt == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	return contains(pt.x, pt.y);

-}

-/**

- * Disposes of the operating system resources associated with

- * the region. Applications must dispose of all regions which

- * they allocate.

+public boolean contains(Point pt) {
+	if (pt == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	return contains(pt.x, pt.y);
+}
+/**
+ * Disposes of the operating system resources associated with
+ * the region. Applications must dispose of all regions which
+ * they allocate.
  */
-public void dispose() {

-	if (handle != 0) OS.gdk_region_destroy(handle);

-	handle = 0;

-}

-

-/**

- * Compares the argument to the receiver, and returns true

- * if they represent the <em>same</em> object using a class

- * specific comparison.

- *

- * @param object the object to compare with this object

- * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise

- *

- * @see #hashCode

+public void dispose() {
+	if (handle != 0) OS.gdk_region_destroy(handle);
+	handle = 0;
+}
+
+/**
+ * Compares the argument to the receiver, and returns true
+ * if they represent the <em>same</em> object using a class
+ * specific comparison.
+ *
+ * @param object the object to compare with this object
+ * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
+ *
+ * @see #hashCode
  */
-public boolean equals(Object object) {

-	if (this == object) return true;

-	if (!(object instanceof Region)) return false;

-	Region region = (Region)object;

-	return handle == region.handle;

-}

-

-/**

- * Returns a rectangle which represents the rectangular

- * union of the collection of rectangles the receiver

- * maintains to describe its area.

- *

- * @return a bounding rectangle for the region

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see Rectangle#union

+public boolean equals(Object object) {
+	if (this == object) return true;
+	if (!(object instanceof Region)) return false;
+	Region region = (Region)object;
+	return handle == region.handle;
+}
+
+/**
+ * Returns a rectangle which represents the rectangular
+ * union of the collection of rectangles the receiver
+ * maintains to describe its area.
+ *
+ * @return a bounding rectangle for the region
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see Rectangle#union
  */
-public Rectangle getBounds() {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	GdkRectangle gdkRect = new GdkRectangle();

-	OS.gdk_region_get_clipbox(handle, gdkRect);

-	return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);

-}

-

-public static Region gtk_new(int handle) {

-	return new Region(handle);

-}

-

-/**

- * Returns an integer hash code for the receiver. Any two 

- * objects which return <code>true</code> when passed to 

- * <code>equals</code> must return the same value for this

- * method.

- *

- * @return the receiver's hash

- *

- * @see #equals

+public Rectangle getBounds() {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	GdkRectangle gdkRect = new GdkRectangle();
+	OS.gdk_region_get_clipbox(handle, gdkRect);
+	return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);
+}
+
+public static Region gtk_new(int handle) {
+	return new Region(handle);
+}
+
+/**
+ * Returns an integer hash code for the receiver. Any two 
+ * objects which return <code>true</code> when passed to 
+ * <code>equals</code> must return the same value for this
+ * method.
+ *
+ * @return the receiver's hash
+ *
+ * @see #equals
  */
-public int hashCode() {

-	return handle;

-}

-

-/**

- * Returns <code>true</code> if the rectangle described by the

- * arguments intersects with any of the rectangles the receiver

- * mainains to describe its area, and <code>false</code> otherwise.

- *

- * @param x the x coordinate of the origin of the rectangle

- * @param y the y coordinate of the origin of the rectangle

- * @param width the width of the rectangle

- * @param height the height of the rectangle

- * @return <code>true</code> if the rectangle intersects with the receiver, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see Rectangle#intersects

+public int hashCode() {
+	return handle;
+}
+
+/**
+ * Returns <code>true</code> if the rectangle described by the
+ * arguments intersects with any of the rectangles the receiver
+ * mainains to describe its area, and <code>false</code> otherwise.
+ *
+ * @param x the x coordinate of the origin of the rectangle
+ * @param y the y coordinate of the origin of the rectangle
+ * @param width the width of the rectangle
+ * @param height the height of the rectangle
+ * @return <code>true</code> if the rectangle intersects with the receiver, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see Rectangle#intersects
  */
-public boolean intersects (int x, int y, int width, int height) {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	GdkRectangle gdkRect = new GdkRectangle();

-	gdkRect.x = x;

-	gdkRect.y = y;

-	gdkRect.width = width;

-	gdkRect.height = height;

-	return OS.gdk_region_rect_in(handle, gdkRect) != OS.GDK_OVERLAP_RECTANGLE_OUT;

-}

-/**

- * Returns <code>true</code> if the given rectangle intersects

- * with any of the rectangles the receiver mainains to describe

- * its area and <code>false</code> otherwise.

- *

- * @param rect the rectangle to test for intersection

- * @return <code>true</code> if the rectangle intersects with the receiver, and <code>false</code> otherwise

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

- *

- * @see Rectangle#intersects

+public boolean intersects (int x, int y, int width, int height) {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	GdkRectangle gdkRect = new GdkRectangle();
+	gdkRect.x = x;
+	gdkRect.y = y;
+	gdkRect.width = width;
+	gdkRect.height = height;
+	return OS.gdk_region_rect_in(handle, gdkRect) != OS.GDK_OVERLAP_RECTANGLE_OUT;
+}
+/**
+ * Returns <code>true</code> if the given rectangle intersects
+ * with any of the rectangles the receiver mainains to describe
+ * its area and <code>false</code> otherwise.
+ *
+ * @param rect the rectangle to test for intersection
+ * @return <code>true</code> if the rectangle intersects with the receiver, and <code>false</code> otherwise
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
+ *
+ * @see Rectangle#intersects
  */
-public boolean intersects(Rectangle rect) {

-	if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);

-	return intersects(rect.x, rect.y, rect.width, rect.height);

-}

-

-/**

- * Returns <code>true</code> if the region has been disposed,

- * and <code>false</code> otherwise.

- * <p>

- * This method gets the dispose state for the region.

- * When a region has been disposed, it is an error to

- * invoke any other method using the region.

- *

- * @return <code>true</code> when the region is disposed, and <code>false</code> otherwise

+public boolean intersects(Rectangle rect) {
+	if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	return intersects(rect.x, rect.y, rect.width, rect.height);
+}
+
+/**
+ * Returns <code>true</code> if the region has been disposed,
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the region.
+ * When a region has been disposed, it is an error to
+ * invoke any other method using the region.
+ *
+ * @return <code>true</code> when the region is disposed, and <code>false</code> otherwise
  */
-public boolean isDisposed() {

-	return handle == 0;

-}

-

-/**

- * Returns <code>true</code> if the receiver does not cover any

- * area in the (x, y) coordinate plane, and <code>false</code> if

- * the receiver does cover some area in the plane.

- *

- * @return <code>true</code> if the receiver is empty, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>

- * </ul>

+public boolean isDisposed() {
+	return handle == 0;
+}
+
+/**
+ * Returns <code>true</code> if the receiver does not cover any
+ * area in the (x, y) coordinate plane, and <code>false</code> if
+ * the receiver does cover some area in the plane.
+ *
+ * @return <code>true</code> if the receiver is empty, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+ * </ul>
  */
-public boolean isEmpty() {

-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);

-	return OS.gdk_region_empty(handle);

-}

-

-/**

- * Returns a string containing a concise, human-readable

- * description of the receiver.

- *

- * @return a string representation of the receiver

+public boolean isEmpty() {
+	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+	return OS.gdk_region_empty(handle);
+}
+
+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the receiver
  */
-public String toString () {

-	if (isDisposed()) return "Region {*DISPOSED*}";

-	return "Region {" + handle + "}";

-}

-}

+public String toString () {
+	if (isDisposed()) return "Region {*DISPOSED*}";
+	return "Region {" + handle + "}";
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
index 2e267e5b84..855722553b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
@@ -1,14 +1,14 @@
-package org.eclipse.swt.internal;

-

-/*

+package org.eclipse.swt.internal;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.internal.gtk.OS;

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.internal.gtk.OS;
+
 /**
  * This class implements the conversions between unicode characters
  * and the <em>platform supported</em> representation for characters.
@@ -16,51 +16,51 @@ import org.eclipse.swt.internal.gtk.OS;
  * Note that, unicode characters which can not be found in the platform
  * encoding will be converted to an arbitrary platform specific character.
  * </p>
- */

-public final class Converter {

-	public static final byte [] NullByteArray = new byte [1];

-	public static final byte [] EmptyByteArray = new byte [0];

-	public static final char [] EmptyCharArray = new char [0];

-

+ */
+public final class Converter {
+	public static final byte [] NullByteArray = new byte [1];
+	public static final byte [] EmptyByteArray = new byte [0];
+	public static final char [] EmptyCharArray = new char [0];
+
 /**
  * Returns the default code page for the platform where the
  * application is currently running.
  *
  * @return the default code page
  */
-public static String defaultCodePage () {

-	return "UTF8";

-}

-

-public static char [] mbcsToWcs (String codePage, byte [] buffer) {

-	int [] items_written = new int [1];

-	int ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);

-	if (ptr == 0) return EmptyCharArray;

-	int length = items_written [0];

-	char [] chars = new char [length];

-	OS.memmove (chars, ptr, length * 2);

-	OS.g_free (ptr);

-	return chars;

-}

-

-public static byte [] wcsToMbcs (String codePage, String string, boolean terminate) {

-	int length = string.length ();

-	char [] buffer = new char [length];

-	string.getChars (0, length, buffer, 0);

-	return wcsToMbcs (codePage, buffer, terminate);

-}

-

-public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {

-	int [] items_read = new int [1], items_written = new int [1];

-	int ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);

-	if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;

-	int written = items_written [0];

-	//TEMPORARY CODE - convertion stops at the first NULL

-	if (items_read [0] != buffer.length && !terminate) written++;

-	byte [] bytes = new byte [written + (terminate ? 1 : 0)];

-	OS.memmove (bytes, ptr, written);

-	OS.g_free (ptr);

-	return bytes;

-}

-

-}

+public static String defaultCodePage () {
+	return "UTF8";
+}
+
+public static char [] mbcsToWcs (String codePage, byte [] buffer) {
+	int [] items_written = new int [1];
+	int ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
+	if (ptr == 0) return EmptyCharArray;
+	int length = items_written [0];
+	char [] chars = new char [length];
+	OS.memmove (chars, ptr, length * 2);
+	OS.g_free (ptr);
+	return chars;
+}
+
+public static byte [] wcsToMbcs (String codePage, String string, boolean terminate) {
+	int length = string.length ();
+	char [] buffer = new char [length];
+	string.getChars (0, length, buffer, 0);
+	return wcsToMbcs (codePage, buffer, terminate);
+}
+
+public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
+	int [] items_read = new int [1], items_written = new int [1];
+	int ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
+	if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
+	int written = items_written [0];
+	//TEMPORARY CODE - convertion stops at the first NULL
+	if (items_read [0] != buffer.length && !terminate) written++;
+	byte [] bytes = new byte [written + (terminate ? 1 : 0)];
+	OS.memmove (bytes, ptr, written);
+	OS.g_free (ptr);
+	return bytes;
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
index b2daae9a6c..103f152da4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
@@ -13,69 +13,69 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 
-/**

- * Instances of this class represent a selectable user interface object that

- * issues notification when pressed and released. 

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>ARROW, CHECK, PUSH, RADIO, TOGGLE, FLAT</dd>

- * <dd>UP, DOWN, LEFT, RIGHT, CENTER</dd>

- * <dt><b>Events:</b></dt>

- * <dd>Selection</dd>

- * </dl>

- * <p>

- * Note: Only one of the styles ARROW, CHECK, PUSH, RADIO, and TOGGLE 

- * may be specified.

- * </p><p>

- * Note: Only one of the styles LEFT, RIGHT, and CENTER may be specified.

- * </p><p>

- * Note: Only one of the styles UP, DOWN, LEFT, and RIGHT may be specified

- * when the ARROW style is specified.

- * </p><p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+/**
+ * Instances of this class represent a selectable user interface object that
+ * issues notification when pressed and released. 
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>ARROW, CHECK, PUSH, RADIO, TOGGLE, FLAT</dd>
+ * <dd>UP, DOWN, LEFT, RIGHT, CENTER</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Selection</dd>
+ * </dl>
+ * <p>
+ * Note: Only one of the styles ARROW, CHECK, PUSH, RADIO, and TOGGLE 
+ * may be specified.
+ * </p><p>
+ * Note: Only one of the styles LEFT, RIGHT, and CENTER may be specified.
+ * </p><p>
+ * Note: Only one of the styles UP, DOWN, LEFT, and RIGHT may be specified
+ * when the ARROW style is specified.
+ * </p><p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
 public class Button extends Control {
 	int boxHandle, labelHandle, imageHandle, arrowHandle;
 	Image image;
 	String text;
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#ARROW

- * @see SWT#CHECK

- * @see SWT#PUSH

- * @see SWT#RADIO

- * @see SWT#TOGGLE

- * @see SWT#FLAT

- * @see SWT#LEFT

- * @see SWT#RIGHT

- * @see SWT#CENTER

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#ARROW
+ * @see SWT#CHECK
+ * @see SWT#PUSH
+ * @see SWT#RADIO
+ * @see SWT#TOGGLE
+ * @see SWT#FLAT
+ * @see SWT#LEFT
+ * @see SWT#RIGHT
+ * @see SWT#CENTER
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Button (Composite parent, int style) {
 	super (parent, checkStyle (style));
@@ -95,29 +95,29 @@ static int checkStyle (int style) {
 	return style;
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the control is selected, by sending

- * it one of the messages defined in the <code>SelectionListener</code>

- * interface.

- * <p>

- * <code>widgetSelected</code> is called when the control is selected.

- * <code>widgetDefaultSelected</code> is not called.

- * </p>

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #removeSelectionListener

- * @see SelectionEvent

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control is selected, by sending
+ * it one of the messages defined in the <code>SelectionListener</code>
+ * interface.
+ * <p>
+ * <code>widgetSelected</code> is called when the control is selected.
+ * <code>widgetDefaultSelected</code> is not called.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
  */
 public void addSelectionListener (SelectionListener listener) {
 	checkWidget ();
@@ -237,21 +237,21 @@ int fontHandle () {
 	return super.fontHandle ();
 }
 
-/**

- * Returns a value which describes the position of the

- * text or image in the receiver. The value will be one of

- * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>

- * unless the receiver is an <code>ARROW</code> button, in 

- * which case, the alignment will indicate the direction of

- * the arrow (one of <code>LEFT</code>, <code>RIGHT</code>, 

- * <code>UP</code> or <code>DOWN</code>).

- *

- * @return the alignment 

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a value which describes the position of the
+ * text or image in the receiver. The value will be one of
+ * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>
+ * unless the receiver is an <code>ARROW</code> button, in 
+ * which case, the alignment will indicate the direction of
+ * the arrow (one of <code>LEFT</code>, <code>RIGHT</code>, 
+ * <code>UP</code> or <code>DOWN</code>).
+ *
+ * @return the alignment 
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getAlignment () {
 	checkWidget ();
@@ -268,16 +268,16 @@ public int getAlignment () {
 	return SWT.LEFT;
 }
 
-/**

- * Returns the receiver's image if it has one, or null

- * if it does not.

- *

- * @return the receiver's image

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's image if it has one, or null
+ * if it does not.
+ *
+ * @return the receiver's image
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Image getImage () {
 	checkWidget ();
@@ -288,21 +288,21 @@ String getNameText () {
 	return getText ();
 }
 
-/**

- * Returns <code>true</code> if the receiver is selected,

- * and false otherwise.

- * <p>

- * When the receiver is of type <code>CHECK</code> or <code>RADIO</code>,

- * it is selected when it is checked. When it is of type <code>TOGGLE</code>,

- * it is selected when it is pushed in. If the receiver is of any other type,

- * this method returns false.

- *

- * @return the selection state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver is selected,
+ * and false otherwise.
+ * <p>
+ * When the receiver is of type <code>CHECK</code> or <code>RADIO</code>,
+ * it is selected when it is checked. When it is of type <code>TOGGLE</code>,
+ * it is selected when it is pushed in. If the receiver is of any other type,
+ * this method returns false.
+ *
+ * @return the selection state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean getSelection () {
 	checkWidget ();
@@ -310,16 +310,16 @@ public boolean getSelection () {
 	return OS.gtk_toggle_button_get_active (handle);
 }
 
-/**

- * Returns the receiver's text, which will be an empty

- * string if it has never been set.

- *

- * @return the receiver's text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's text, which will be an empty
+ * string if it has never been set.
+ *
+ * @return the receiver's text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public String getText () {
 	checkWidget();
@@ -388,22 +388,22 @@ void releaseWidget () {
 	text = null;
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the control is selected.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #addSelectionListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control is selected.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #addSelectionListener
  */
 public void removeSelectionListener (SelectionListener listener) {
 	checkWidget();
@@ -413,21 +413,21 @@ public void removeSelectionListener (SelectionListener listener) {
 	eventTable.unhook (SWT.DefaultSelection,listener);	
 }
 
-/**

- * Controls how text, images and arrows will be displayed

- * in the receiver. The argument should be one of

- * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>

- * unless the receiver is an <code>ARROW</code> button, in 

- * which case, the argument indicates the direction of

- * the arrow (one of <code>LEFT</code>, <code>RIGHT</code>, 

- * <code>UP</code> or <code>DOWN</code>).

- *

- * @param alignment the new alignment 

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Controls how text, images and arrows will be displayed
+ * in the receiver. The argument should be one of
+ * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>
+ * unless the receiver is an <code>ARROW</code> button, in 
+ * which case, the argument indicates the direction of
+ * the arrow (one of <code>LEFT</code>, <code>RIGHT</code>, 
+ * <code>UP</code> or <code>DOWN</code>).
+ *
+ * @param alignment the new alignment 
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setAlignment (int alignment) {
 	checkWidget ();
@@ -488,19 +488,19 @@ void setForegroundColor (GdkColor color) {
 	if (imageHandle != 0) OS.gtk_widget_modify_fg (imageHandle, 0, color);
 }
 
-/**

- * Sets the receiver's image to the argument, which may be

- * null indicating that no image should be displayed.

- *

- * @param image the image to display on the receiver (may be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>

- * </ul> 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's image to the argument, which may be
+ * null indicating that no image should be displayed.
+ *
+ * @param image the image to display on the receiver (may be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
+ * </ul> 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setImage (Image image) {
 	checkWidget ();
@@ -525,21 +525,21 @@ public void setImage (Image image) {
 	OS.gtk_widget_size_request (handle, requisition);
 }
 
-/**

- * Sets the selection state of the receiver, if it is of type <code>CHECK</code>, 

- * <code>RADIO</code>, or <code>TOGGLE</code>.

- *

- * <p>

- * When the receiver is of type <code>CHECK</code> or <code>RADIO</code>,

- * it is selected when it is checked. When it is of type <code>TOGGLE</code>,

- * it is selected when it is pushed in.

- *

- * @param selected the new selection state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the selection state of the receiver, if it is of type <code>CHECK</code>, 
+ * <code>RADIO</code>, or <code>TOGGLE</code>.
+ *
+ * <p>
+ * When the receiver is of type <code>CHECK</code> or <code>RADIO</code>,
+ * it is selected when it is checked. When it is of type <code>TOGGLE</code>,
+ * it is selected when it is pushed in.
+ *
+ * @param selected the new selection state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSelection (boolean selected) {
 	checkWidget();
@@ -549,22 +549,22 @@ public void setSelection (boolean selected) {
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
 }
 
-/**

- * Sets the receiver's text.

- * <p>

- * This method sets the button label.  The label may include

- * the mnemonic character but must not contain line delimiters.

- * </p>

- * 

- * @param string the new text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's text.
+ * <p>
+ * This method sets the button label.  The label may include
+ * the mnemonic character but must not contain line delimiters.
+ * </p>
+ * 
+ * @param string the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setText (String string) {
 	checkWidget ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
index 5a9bc9b21b..c8e88faf06 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
@@ -11,79 +11,79 @@ import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.*;
 
-/**

- * Instances of this class provide a surface for drawing

- * arbitrary graphics.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * This class may be subclassed by custom control implementors

- * who are building controls that are <em>not</em> constructed

- * from aggregates of other controls. That is, they are either

- * painted using SWT graphics calls or are handled by native

- * methods.

- * </p>

- *

- * @see Composite

+/**
+ * Instances of this class provide a surface for drawing
+ * arbitrary graphics.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * This class may be subclassed by custom control implementors
+ * who are building controls that are <em>not</em> constructed
+ * from aggregates of other controls. That is, they are either
+ * painted using SWT graphics calls or are handled by native
+ * methods.
+ * </p>
+ *
+ * @see Composite
  */
 public class Canvas extends Composite {
 	Caret caret;
 
 Canvas () {}
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Canvas (Composite parent, int style) {
 	super (parent, style);
 }
 
-/**

- * Returns the caret.

- * <p>

- * The caret for the control is automatically hidden

- * and shown when the control is painted or resized,

- * when focus is gained or lost and when an the control

- * is scrolled.  To avoid drawing on top of the caret,

- * the programmer must hide and show the caret when

- * drawing in the window any other time.

- * </p>

- *

- * @return the caret

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the caret.
+ * <p>
+ * The caret for the control is automatically hidden
+ * and shown when the control is painted or resized,
+ * when focus is gained or lost and when an the control
+ * is scrolled.  To avoid drawing on top of the caret,
+ * the programmer must hide and show the caret when
+ * drawing in the window any other time.
+ * </p>
+ *
+ * @return the caret
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Caret getCaret () {
 	checkWidget();
@@ -128,27 +128,27 @@ void releaseWidget () {
 	super.releaseWidget();
 }
 
-/**

- * Scrolls a rectangular area of the receiver by first copying 

- * the source area to the destination and then causing the area

- * of the source which is not covered by the destination to

- * be repainted. Children that intersect the rectangle are

- * optionally moved during the operation. In addition, outstanding

- * paint events are flushed before the source area is copied to

- * ensure that the contents of the canvas are drawn correctly.

- *

- * @param destX the x coordinate of the destination

- * @param destY the y coordinate of the destination

- * @param x the x coordinate of the source

- * @param y the y coordinate of the source

- * @param width the width of the area

- * @param height the height of the area

- * @param all <code>true</code>if children should be scrolled, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Scrolls a rectangular area of the receiver by first copying 
+ * the source area to the destination and then causing the area
+ * of the source which is not covered by the destination to
+ * be repainted. Children that intersect the rectangle are
+ * optionally moved during the operation. In addition, outstanding
+ * paint events are flushed before the source area is copied to
+ * ensure that the contents of the canvas are drawn correctly.
+ *
+ * @param destX the x coordinate of the destination
+ * @param destY the y coordinate of the destination
+ * @param x the x coordinate of the source
+ * @param y the y coordinate of the source
+ * @param width the width of the area
+ * @param height the height of the area
+ * @param all <code>true</code>if children should be scrolled, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void scroll (int destX, int destY, int x, int y, int width, int height, boolean all) {
 	checkWidget();
@@ -233,25 +233,25 @@ boolean setBounds (int x, int y, int width, int height, boolean move, boolean re
 	return changed;
 }
 
-/**

- * Sets the receiver's caret.

- * <p>

- * The caret for the control is automatically hidden

- * and shown when the control is painted or resized,

- * when focus is gained or lost and when an the control

- * is scrolled.  To avoid drawing on top of the caret,

- * the programmer must hide and show the caret when

- * drawing in the window any other time.

- * </p>

- * @param caret the new caret for the receiver, may be null

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the caret has been disposed</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's caret.
+ * <p>
+ * The caret for the control is automatically hidden
+ * and shown when the control is painted or resized,
+ * when focus is gained or lost and when an the control
+ * is scrolled.  To avoid drawing on top of the caret,
+ * the programmer must hide and show the caret when
+ * drawing in the window any other time.
+ * </p>
+ * @param caret the new caret for the receiver, may be null
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the caret has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setCaret (Caret caret) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
index 496e49749d..f7a7abf241 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
@@ -11,19 +11,19 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
-/**

- * Instances of this class provide an i-beam that is typically used

- * as the insertion point for text.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+/**
+ * Instances of this class provide an i-beam that is typically used
+ * as the insertion point for text.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
 public class Caret extends Widget {
 	Canvas parent;
@@ -33,33 +33,33 @@ public class Caret extends Widget {
 	Image image;
 	Font font;
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Caret (Canvas parent, int style) {
 	super (parent, style);
@@ -108,16 +108,16 @@ boolean drawCaret () {
 	return true;
 }
 
-/**

- * Returns a rectangle describing the receiver's size and location

- * relative to its parent (or its display if its parent is null).

- *

- * @return the receiver's bounding rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a rectangle describing the receiver's size and location
+ * relative to its parent (or its display if its parent is null).
+ *
+ * @return the receiver's bounding rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Rectangle getBounds () {
 	checkWidget();
@@ -134,15 +134,15 @@ public Display getDisplay () {
 	return parent.getDisplay ();
 }
 
-/**

- * Returns the font that the receiver will use to paint textual information.

- *

- * @return the receiver's font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the font that the receiver will use to paint textual information.
+ *
+ * @return the receiver's font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Font getFont () {
 	checkWidget();
@@ -150,61 +150,61 @@ public Font getFont () {
 	return parent.getFont ();
 }
 
-/**

- * Returns the image that the receiver will use to paint the caret.

- *

- * @return the receiver's image

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the image that the receiver will use to paint the caret.
+ *
+ * @return the receiver's image
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Image getImage () {
 	checkWidget();
 	return image;
 }
 
-/**

- * Returns a point describing the receiver's location relative

- * to its parent (or its display if its parent is null).

- *

- * @return the receiver's location

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point describing the receiver's location relative
+ * to its parent (or its display if its parent is null).
+ *
+ * @return the receiver's location
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getLocation () {
 	checkWidget();
 	return new Point (x, y);
 }
 
-/**

- * Returns the receiver's parent, which must be a <code>Canvas</code>.

- *

- * @return the receiver's parent

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's parent, which must be a <code>Canvas</code>.
+ *
+ * @return the receiver's parent
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Canvas getParent () {
 	checkWidget();
 	return parent;
 }
 
-/**

- * Returns a point describing the receiver's size.

- *

- * @return the receiver's size

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point describing the receiver's size.
+ *
+ * @return the receiver's size
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getSize () {
 	checkWidget();
@@ -215,22 +215,22 @@ public Point getSize () {
 	return new Point (width, height);
 }
 
-/**

- * Returns <code>true</code> if the receiver is visible, and

- * <code>false</code> otherwise.

- * <p>

- * If one of the receiver's ancestors is not visible or some

- * other condition makes the receiver not visible, this method

- * may still indicate that it is considered visible even though

- * it may not actually be showing.

- * </p>

- *

- * @return the receiver's visibility state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver is visible, and
+ * <code>false</code> otherwise.
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, this method
+ * may still indicate that it is considered visible even though
+ * it may not actually be showing.
+ * </p>
+ *
+ * @return the receiver's visibility state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean getVisible () {
 	checkWidget();
@@ -290,21 +290,21 @@ void releaseWidget () {
 	image = null;
 }
 
-/**

- * Sets the receiver's size and location to the rectangular

- * area specified by the arguments. The <code>x</code> and 

- * <code>y</code> arguments are relative to the receiver's

- * parent (or its display if its parent is null).

- *

- * @param x the new x coordinate for the receiver

- * @param y the new y coordinate for the receiver

- * @param width the new width for the receiver

- * @param height the new height for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size and location to the rectangular
+ * area specified by the arguments. The <code>x</code> and 
+ * <code>y</code> arguments are relative to the receiver's
+ * parent (or its display if its parent is null).
+ *
+ * @param x the new x coordinate for the receiver
+ * @param y the new y coordinate for the receiver
+ * @param width the new width for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setBounds (int x, int y, int width, int height) {
 	checkWidget();
@@ -317,18 +317,18 @@ public void setBounds (int x, int y, int width, int height) {
 	if (isFocus) showCaret ();
 }
 
-/**

- * Sets the receiver's size and location to the rectangular

- * area specified by the argument. The <code>x</code> and 

- * <code>y</code> fields of the rectangle are relative to

- * the receiver's parent (or its display if its parent is null).

- *

- * @param rect the new bounds for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size and location to the rectangular
+ * area specified by the argument. The <code>x</code> and 
+ * <code>y</code> fields of the rectangle are relative to
+ * the receiver's parent (or its display if its parent is null).
+ *
+ * @param rect the new bounds for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setBounds (Rectangle rect) {
 	checkWidget();
@@ -343,20 +343,20 @@ void setFocus () {
 	if (isVisible) showCaret ();
 }
 
-/**

- * Sets the font that the receiver will use to paint textual information

- * to the font specified by the argument, or to the default font for that

- * kind of control if the argument is null.

- *

- * @param font the new font (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>

- * </ul> 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the font that the receiver will use to paint textual information
+ * to the font specified by the argument, or to the default font for that
+ * kind of control if the argument is null.
+ *
+ * @param font the new font (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
+ * </ul> 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setFont (Font font) {
 	checkWidget();
@@ -366,20 +366,20 @@ public void setFont (Font font) {
 	this.font = font;
 }
 
-/**

- * Sets the image that the receiver will use to paint the caret

- * to the image specified by the argument, or to the default

- * which is a filled rectangle if the argument is null

- *

- * @param font the new font (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>

- * </ul> 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the image that the receiver will use to paint the caret
+ * to the image specified by the argument, or to the default
+ * which is a filled rectangle if the argument is null
+ *
+ * @param font the new font (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
+ * </ul> 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setImage (Image image) {
 	checkWidget();
@@ -392,35 +392,35 @@ public void setImage (Image image) {
 	if (isFocus) showCaret ();
 }
 
-/**

- * Sets the receiver's location to the point specified by

- * the arguments which are relative to the receiver's

- * parent (or its display if its parent is null).

- *

- * @param x the new x coordinate for the receiver

- * @param y the new y coordinate for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's location to the point specified by
+ * the arguments which are relative to the receiver's
+ * parent (or its display if its parent is null).
+ *
+ * @param x the new x coordinate for the receiver
+ * @param y the new y coordinate for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLocation (int x, int y) {
 	checkWidget();
 	setBounds (x, y, width, height);
 }
 
-/**

- * Sets the receiver's location to the point specified by

- * the argument which is relative to the receiver's

- * parent (or its display if its parent is null).

- *

- * @param location the new location for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's location to the point specified by
+ * the argument which is relative to the receiver's
+ * parent (or its display if its parent is null).
+ *
+ * @param location the new location for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLocation (Point location) {
 	checkWidget();
@@ -428,35 +428,35 @@ public void setLocation (Point location) {
 	setLocation (location.x, location.y);
 }
 
-/**

- * Sets the receiver's size to the point specified by the arguments.

- *

- * @param width the new width for the receiver

- * @param height the new height for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size to the point specified by the arguments.
+ *
+ * @param width the new width for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSize (int width, int height) {
 	checkWidget();
 	setBounds (x, y, width, height);
 }
 
-/**

- * Sets the receiver's size to the point specified by the argument.

- *

- * @param size the new extent for the receiver

- * @param height the new height for the receiver

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size to the point specified by the argument.
+ *
+ * @param size the new extent for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSize (Point size) {
 	checkWidget();
@@ -464,21 +464,21 @@ public void setSize (Point size) {
 	setSize (size.x, size.y);
 }
 
-/**

- * Marks the receiver as visible if the argument is <code>true</code>,

- * and marks it invisible otherwise. 

- * <p>

- * If one of the receiver's ancestors is not visible or some

- * other condition makes the receiver not visible, marking

- * it visible may not actually cause it to be displayed.

- * </p>

- *

- * @param visible the new visibility state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Marks the receiver as visible if the argument is <code>true</code>,
+ * and marks it invisible otherwise. 
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, marking
+ * it visible may not actually cause it to be displayed.
+ * </p>
+ *
+ * @param visible the new visibility state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setVisible (boolean visible) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
index 9c2b3c5733..1349f4aaac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
@@ -1,147 +1,147 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-

-/**

- * Instances of this class allow the user to select a color

- * from a predefined set of available colors.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class ColorDialog extends Dialog {

-	RGB rgb;

-/**

- * Constructs a new instance of this class given only its parent.

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+
+/**
+ * Instances of this class allow the user to select a color
+ * from a predefined set of available colors.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
-public ColorDialog (Shell parent) {

-	this (parent, SWT.NULL);

-}

-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+public class ColorDialog extends Dialog {
+	RGB rgb;
+/**
+ * Constructs a new instance of this class given only its parent.
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
-public ColorDialog (Shell parent, int style) {

-	super (parent, style);

-	checkSubclass ();

-}

-

-/**

- * Returns the currently selected color in the receiver.

- *

- * @return the RGB value for the selected color, may be null

- *

- * @see PaletteData#getRGBs

+public ColorDialog (Shell parent) {
+	this (parent, SWT.NULL);
+}
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
-public RGB getRGB () {

-	return rgb;

-}

-/**

- * Makes the receiver visible and brings it to the front

- * of the display.

- *

- * @return the selected color, or null if the dialog was

- *         cancelled, no color was selected, or an error

- *         occurred

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public ColorDialog (Shell parent, int style) {
+	super (parent, style);
+	checkSubclass ();
+}
+
+/**
+ * Returns the currently selected color in the receiver.
+ *
+ * @return the RGB value for the selected color, may be null
+ *
+ * @see PaletteData#getRGBs
  */
-public RGB open () {

-	byte [] buffer = Converter.wcsToMbcs (null, title, true);

-	int handle = OS.gtk_color_selection_dialog_new (buffer);

-	if (parent!=null) {

-		OS.gtk_window_set_transient_for(handle, parent.topHandle());

-	}

-	GtkColorSelectionDialog dialog = new GtkColorSelectionDialog ();

-	OS.memmove(dialog, handle);

-	GdkColor color = new GdkColor();

-	if (rgb != null) {

-		color.red = (short)((rgb.red & 0xFF) | ((rgb.red & 0xFF) << 8));

-		color.green = (short)((rgb.green & 0xFF) | ((rgb.green & 0xFF) << 8));

-		color.blue = (short)((rgb.blue & 0xFF) | ((rgb.blue & 0xFF) << 8));

-		OS.gtk_color_selection_set_current_color (dialog.colorsel, color);

-	}

-	int response = OS.gtk_dialog_run(handle);

-	boolean success = response == OS.GTK_RESPONSE_OK; 

-	if (success) {

-		OS.gtk_color_selection_get_current_color (dialog.colorsel, color);

-		int red = (color.red >> 8) & 0xFF;

-		int green = (color.green >> 8) & 0xFF;

-		int blue = (color.blue >> 8) & 0xFF;

-		rgb = new RGB (red, green, blue);

-	}

-	OS.gtk_widget_destroy(handle);

-	if (!success) return null;

-	return rgb;

-}

-/**

- * Returns the receiver's selected color to be the argument.

- *

- * @param rgb the new RGB value for the selected color, may be

- *        null to let the platform to select a default when

- *        open() is called

- *

- * @see PaletteData#getRGBs

+public RGB getRGB () {
+	return rgb;
+}
+/**
+ * Makes the receiver visible and brings it to the front
+ * of the display.
+ *
+ * @return the selected color, or null if the dialog was
+ *         cancelled, no color was selected, or an error
+ *         occurred
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setRGB (RGB rgb) {

-	this.rgb = rgb;

-}

-}

+public RGB open () {
+	byte [] buffer = Converter.wcsToMbcs (null, title, true);
+	int handle = OS.gtk_color_selection_dialog_new (buffer);
+	if (parent!=null) {
+		OS.gtk_window_set_transient_for(handle, parent.topHandle());
+	}
+	GtkColorSelectionDialog dialog = new GtkColorSelectionDialog ();
+	OS.memmove(dialog, handle);
+	GdkColor color = new GdkColor();
+	if (rgb != null) {
+		color.red = (short)((rgb.red & 0xFF) | ((rgb.red & 0xFF) << 8));
+		color.green = (short)((rgb.green & 0xFF) | ((rgb.green & 0xFF) << 8));
+		color.blue = (short)((rgb.blue & 0xFF) | ((rgb.blue & 0xFF) << 8));
+		OS.gtk_color_selection_set_current_color (dialog.colorsel, color);
+	}
+	int response = OS.gtk_dialog_run(handle);
+	boolean success = response == OS.GTK_RESPONSE_OK; 
+	if (success) {
+		OS.gtk_color_selection_get_current_color (dialog.colorsel, color);
+		int red = (color.red >> 8) & 0xFF;
+		int green = (color.green >> 8) & 0xFF;
+		int blue = (color.blue >> 8) & 0xFF;
+		rgb = new RGB (red, green, blue);
+	}
+	OS.gtk_widget_destroy(handle);
+	if (!success) return null;
+	return rgb;
+}
+/**
+ * Returns the receiver's selected color to be the argument.
+ *
+ * @param rgb the new RGB value for the selected color, may be
+ *        null to let the platform to select a default when
+ *        open() is called
+ *
+ * @see PaletteData#getRGBs
+ */
+public void setRGB (RGB rgb) {
+	this.rgb = rgb;
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index f95acf6d97..f9b32b7f84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -13,48 +13,48 @@ import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 
-/**

- * Instances of this class are controls that allow the user

- * to choose an item from a list of items, or optionally 

- * enter a new value by typing it into an editable text

- * field. Often, <code>Combo</code>s are used in the same place

- * where a single selection <code>List</code> widget could

- * be used but space is limited. A <code>Combo</code> takes

- * less space than a <code>List</code> widget and shows

- * similar information.

- * <p>

- * Note: Since <code>Combo</code>s can contain both a list

- * and an editable text field, it is possible to confuse methods

- * which access one versus the other (compare for example,

- * <code>clearSelection()</code> and <code>deselectAll()</code>).

- * The API documentation is careful to indicate either "the

- * receiver's list" or the "the receiver's text field" to 

- * distinguish between the two cases.

- * </p><p>

- * Note that although this class is a subclass of <code>Composite</code>,

- * it does not make sense to add children to it, or set a layout on it.

- * </p>

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>DROP_DOWN, READ_ONLY, SIMPLE</dd>

- * <dt><b>Events:</b></dt>

- * <dd>DefaultSelection, Modify, Selection</dd>

- * </dl>

- * <p>

- * Note: Only one of the styles DROP_DOWN and SIMPLE 

- * may be specified.

- * </p><p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

- *

- * @see List

+/**
+ * Instances of this class are controls that allow the user
+ * to choose an item from a list of items, or optionally 
+ * enter a new value by typing it into an editable text
+ * field. Often, <code>Combo</code>s are used in the same place
+ * where a single selection <code>List</code> widget could
+ * be used but space is limited. A <code>Combo</code> takes
+ * less space than a <code>List</code> widget and shows
+ * similar information.
+ * <p>
+ * Note: Since <code>Combo</code>s can contain both a list
+ * and an editable text field, it is possible to confuse methods
+ * which access one versus the other (compare for example,
+ * <code>clearSelection()</code> and <code>deselectAll()</code>).
+ * The API documentation is careful to indicate either "the
+ * receiver's list" or the "the receiver's text field" to 
+ * distinguish between the two cases.
+ * </p><p>
+ * Note that although this class is a subclass of <code>Composite</code>,
+ * it does not make sense to add children to it, or set a layout on it.
+ * </p>
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>DROP_DOWN, READ_ONLY, SIMPLE</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>DefaultSelection, Modify, Selection</dd>
+ * </dl>
+ * <p>
+ * Note: Only one of the styles DROP_DOWN and SIMPLE 
+ * may be specified.
+ * </p><p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
+ *
+ * @see List
  */
 public class Combo extends Composite {
 	int arrowHandle, entryHandle, listHandle;
 	String [] items = new String [0];
-	/**

-	 * the operating system limit for the number of characters

-	 * that the text field in an instance of this class can hold

+	/**
+	 * the operating system limit for the number of characters
+	 * that the text field in an instance of this class can hold
 	 */
 	public final static int LIMIT;
 	
@@ -67,57 +67,57 @@ public class Combo extends Composite {
 		LIMIT = 0xFFFF;
 	}
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#DROP_DOWN

- * @see SWT#READ_ONLY

- * @see SWT#SIMPLE

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#DROP_DOWN
+ * @see SWT#READ_ONLY
+ * @see SWT#SIMPLE
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Combo (Composite parent, int style) {
 	super (parent, checkStyle (style));
 }
 
-/**

- * Adds the argument to the end of the receiver's list.

- *

- * @param string the new item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

- *

- * @see #add(String,int)

+/**
+ * Adds the argument to the end of the receiver's list.
+ *
+ * @param string the new item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ * @see #add(String,int)
  */
 public void add (String string) {
 	checkWidget();
@@ -128,31 +128,31 @@ public void add (String string) {
 	setItems (newItems, true, true);
 }
 
-/**

- * Adds the argument to the receiver's list at the given

- * zero-relative index.

- * <p>

- * Note: To add an item at the end of the list, use the

- * result of calling <code>getItemCount()</code> as the

- * index or use <code>add(String)</code>.

- * </p>

- *

- * @param string the new item

- * @param index the index for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

- *

- * @see #add(String)

+/**
+ * Adds the argument to the receiver's list at the given
+ * zero-relative index.
+ * <p>
+ * Note: To add an item at the end of the list, use the
+ * result of calling <code>getItemCount()</code> as the
+ * index or use <code>add(String)</code>.
+ * </p>
+ *
+ * @param string the new item
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ * @see #add(String)
  */
 public void add (String string, int index) {
 	checkWidget();
@@ -167,24 +167,24 @@ public void add (String string, int index) {
 	setItems (newItems, true, true);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the receiver's text is modified, by sending

- * it one of the messages defined in the <code>ModifyListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ModifyListener

- * @see #removeModifyListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's text is modified, by sending
+ * it one of the messages defined in the <code>ModifyListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ModifyListener
+ * @see #removeModifyListener
  */
 public void addModifyListener (ModifyListener listener) {
 	checkWidget();
@@ -193,29 +193,29 @@ public void addModifyListener (ModifyListener listener) {
 	addListener (SWT.Modify, typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the receiver's selection changes, by sending

- * it one of the messages defined in the <code>SelectionListener</code>

- * interface.

- * <p>

- * <code>widgetSelected</code> is called when the combo's list selection changes.

- * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed the combo's text area.

- * </p>

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #removeSelectionListener

- * @see SelectionEvent

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's selection changes, by sending
+ * it one of the messages defined in the <code>SelectionListener</code>
+ * interface.
+ * <p>
+ * <code>widgetSelected</code> is called when the combo's list selection changes.
+ * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed the combo's text area.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
  */
 public void addSelectionListener(SelectionListener listener) {
 	checkWidget();
@@ -253,22 +253,22 @@ static int checkStyle (int style) {
 	return style;
 }
 
-/**

- * Sets the selection in the receiver's text field to an empty

- * selection starting just before the first character. If the

- * text field is editable, this has the effect of placing the

- * i-beam at the start of the text.

- * <p>

- * Note: To clear the selected items in the receiver's list, 

- * use <code>deselectAll()</code>.

- * </p>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #deselectAll

+/**
+ * Sets the selection in the receiver's text field to an empty
+ * selection starting just before the first character. If the
+ * text field is editable, this has the effect of placing the
+ * i-beam at the start of the text.
+ * <p>
+ * Note: To clear the selected items in the receiver's list, 
+ * use <code>deselectAll()</code>.
+ * </p>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #deselectAll
  */
 public void clearSelection () {
 	checkWidget();
@@ -452,36 +452,36 @@ void hookEvents () {
 	}
 }
 
-/**

- * Deselects the item at the given zero-relative index in the receiver's 

- * list.  If the item at the index was already deselected, it remains

- * deselected. Indices that are out of range are ignored.

- *

- * @param index the index of the item to deselect

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Deselects the item at the given zero-relative index in the receiver's 
+ * list.  If the item at the index was already deselected, it remains
+ * deselected. Indices that are out of range are ignored.
+ *
+ * @param index the index of the item to deselect
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void deselect (int index) {
 	checkWidget();
 	setItems (items, true, getSelectionIndex () != index);
 }
 
-/**

- * Deselects all selected items in the receiver's list.

- * <p>

- * Note: To clear the selection in the receiver's text field,

- * use <code>clearSelection()</code>.

- * </p>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #clearSelection

+/**
+ * Deselects all selected items in the receiver's list.
+ * <p>
+ * Note: To clear the selection in the receiver's text field,
+ * use <code>clearSelection()</code>.
+ * </p>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #clearSelection
  */
 public void deselectAll () {
 	checkWidget();
@@ -500,24 +500,24 @@ GdkColor getForegroundColor () {
 	return getTextColor ();
 }
 
-/**

- * Returns the item at the given, zero-relative index in the

- * receiver's list. Throws an exception if the index is out

- * of range.

- *

- * @param index the index of the item to return

- * @return the item at the given index

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the item at the given, zero-relative index in the
+ * receiver's list. Throws an exception if the index is out
+ * of range.
+ *
+ * @param index the index of the item to return
+ * @return the item at the given index
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public String getItem (int index) {
 	checkWidget();
@@ -527,61 +527,61 @@ public String getItem (int index) {
 	return items [index];
 }
 
-/**

- * Returns the number of items contained in the receiver's list.

- *

- * @return the number of items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the number of items contained in the receiver's list.
+ *
+ * @return the number of items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getItemCount () {
 	checkWidget();
 	return items.length;
 }
 
-/**

- * Returns the height of the area which would be used to

- * display <em>one</em> of the items in the receiver's list.

- *

- * @return the height of one item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the height of the area which would be used to
+ * display <em>one</em> of the items in the receiver's list.
+ *
+ * @return the height of one item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getItemHeight () {
 	checkWidget();
 	return fontHeight (getFontDescription (), listHandle != 0 ? listHandle : handle);
 }
 
-/**

- * Returns an array of <code>String</code>s which are the items

- * in the receiver's list. 

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its list of items, so modifying the array will

- * not affect the receiver. 

- * </p>

- *

- * @return the items in the receiver's list

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns an array of <code>String</code>s which are the items
+ * in the receiver's list. 
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its list of items, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ *
+ * @return the items in the receiver's list
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public String [] getItems () {
 	checkWidget();
@@ -590,19 +590,19 @@ public String [] getItems () {
 	return result;
 }
 
-/**

- * Returns a <code>Point</code> whose x coordinate is the start

- * of the selection in the receiver's text field, and whose y

- * coordinate is the end of the selection. The returned values

- * are zero-relative. An "empty" selection as indicated by

- * the the x and y coordinates having the same value.

- *

- * @return a point representing the selection start and end

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a <code>Point</code> whose x coordinate is the start
+ * of the selection in the receiver's text field, and whose y
+ * coordinate is the end of the selection. The returned values
+ * are zero-relative. An "empty" selection as indicated by
+ * the the x and y coordinates having the same value.
+ *
+ * @return a point representing the selection start and end
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getSelection () {
 	checkWidget ();
@@ -612,16 +612,16 @@ public Point getSelection () {
 	return new Point(start [0], end [0]);
 }
 
-/**

- * Returns the zero-relative index of the item which is currently

- * selected in the receiver's list, or -1 if no item is selected.

- *

- * @return the index of the selected item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the zero-relative index of the item which is currently
+ * selected in the receiver's list, or -1 if no item is selected.
+ *
+ * @return the index of the selected item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getSelectionIndex () {
 	checkWidget();
@@ -629,16 +629,16 @@ public int getSelectionIndex () {
 	return indexOf (getText ());
 }
 
-/**

- * Returns a string containing a copy of the contents of the

- * receiver's text field.

- *

- * @return the receiver's text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a string containing a copy of the contents of the
+ * receiver's text field.
+ *
+ * @return the receiver's text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public String getText () {
 	checkWidget();
@@ -658,36 +658,36 @@ String getText (int start, int stop) {
 	return getText ().substring (start, stop - 1);
 }
 
-/**

- * Returns the height of the receivers's text field.

- *

- * @return the text height

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the height of the receivers's text field.
+ *
+ * @return the text height
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getTextHeight () {
 	checkWidget();
 	return fontHeight (getFontDescription (), entryHandle != 0 ? entryHandle : handle) + 8;
 }
 
-/**

- * Returns the maximum number of characters that the receiver's

- * text field is capable of holding. If this has not been changed

- * by <code>setTextLimit()</code>, it will be the constant

- * <code>Combo.LIMIT</code>.

- * 

- * @return the text limit

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the maximum number of characters that the receiver's
+ * text field is capable of holding. If this has not been changed
+ * by <code>setTextLimit()</code>, it will be the constant
+ * <code>Combo.LIMIT</code>.
+ * 
+ * @return the text limit
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getTextLimit () {
 	checkWidget();
@@ -710,45 +710,45 @@ int gtk_select_child (int list, int widget) {
 	return 0;
 }
 
-/**

- * Searches the receiver's list starting at the first item

- * (index 0) until an item is found that is equal to the 

- * argument, and returns the index of that item. If no item

- * is found, returns -1.

- *

- * @param string the search item

- * @return the index of the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Searches the receiver's list starting at the first item
+ * (index 0) until an item is found that is equal to the 
+ * argument, and returns the index of that item. If no item
+ * is found, returns -1.
+ *
+ * @param string the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int indexOf (String string) {
 	checkWidget();
 	return indexOf (string, 0);
 }
 
-/**

- * Searches the receiver's list starting at the given, 

- * zero-relative index until an item is found that is equal

- * to the argument, and returns the index of that item. If

- * no item is found or the starting index is out of range,

- * returns -1.

- *

- * @param string the search item

- * @return the index of the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Searches the receiver's list starting at the given, 
+ * zero-relative index until an item is found that is equal
+ * to the argument, and returns the index of that item. If
+ * no item is found or the starting index is out of range,
+ * returns -1.
+ *
+ * @param string the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int indexOf (String string, int start) {
 	checkWidget();
@@ -794,22 +794,22 @@ void releaseHandle () {
 	entryHandle = listHandle = 0;
 }
 
-/**

- * Removes the item from the receiver's list at the given

- * zero-relative index.

- *

- * @param index the index for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Removes the item from the receiver's list at the given
+ * zero-relative index.
+ *
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (int index) {
 	checkWidget();
@@ -823,24 +823,24 @@ public void remove (int index) {
 	setItems (newItems, true, true);
 }
 
-/**

- * Removes the items from the receiver's list which are

- * between the given zero-relative start and end 

- * indices (inclusive).

- *

- * @param start the start of the range

- * @param end the end of the range

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Removes the items from the receiver's list which are
+ * between the given zero-relative start and end 
+ * indices (inclusive).
+ *
+ * @param start the start of the range
+ * @param end the end of the range
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (int start, int end) {
 	checkWidget();
@@ -854,24 +854,24 @@ public void remove (int start, int end) {
 	setItems (newItems, true, true);
 }
 
-/**

- * Searches the receiver's list starting at the first item

- * until an item is found that is equal to the argument, 

- * and removes that item from the list.

- *

- * @param string the item to remove

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Searches the receiver's list starting at the first item
+ * until an item is found that is equal to the argument, 
+ * and removes that item from the list.
+ *
+ * @param string the item to remove
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (String string) {
 	checkWidget();
@@ -880,35 +880,35 @@ public void remove (String string) {
 	remove (index);
 }
 
-/**

- * Removes all of the items from the receiver's list.

- * <p>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Removes all of the items from the receiver's list.
+ * <p>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void removeAll () {
 	checkWidget();
 	setItems (new String [0], false, false);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the receiver's text is modified.

- *

- * @param listener the listener which should no longer be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ModifyListener

- * @see #addModifyListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the receiver's text is modified.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ModifyListener
+ * @see #addModifyListener
  */
 public void removeModifyListener (ModifyListener listener) {
 	checkWidget();
@@ -917,22 +917,22 @@ public void removeModifyListener (ModifyListener listener) {
 	eventTable.unhook (SWT.Modify, listener);	
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the receiver's selection changes.

- *

- * @param listener the listener which should no longer be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #addSelectionListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the receiver's selection changes.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #addSelectionListener
  */
 public void removeSelectionListener (SelectionListener listener) {
 	checkWidget();
@@ -942,17 +942,17 @@ public void removeSelectionListener (SelectionListener listener) {
 	eventTable.unhook (SWT.DefaultSelection,listener);	
 }
 
-/**

- * Selects the item at the given zero-relative index in the receiver's 

- * list.  If the item at the index was already selected, it remains

- * selected. Indices that are out of range are ignored.

- *

- * @param index the index of the item to select

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Selects the item at the given zero-relative index in the receiver's 
+ * list.  If the item at the index was already selected, it remains
+ * selected. Indices that are out of range are ignored.
+ *
+ * @param index the index of the item to select
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void select (int index) {
 	checkWidget();
@@ -983,26 +983,26 @@ void setForegroundColor (GdkColor color) {
 	if (listHandle != 0) OS.gtk_widget_modify_text (listHandle, 0, color);
 }
 
-/**

- * Sets the text of the item in the receiver's list at the given

- * zero-relative index to the string argument. This is equivalent

- * to <code>remove</code>'ing the old item at the index, and then

- * <code>add</code>'ing the new item at that index.

- *

- * @param index the index for the item

- * @param string the new text for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the remove operation fails because of an operating system failure</li>

- *    <li>ERROR_ITEM_NOT_ADDED - if the add operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Sets the text of the item in the receiver's list at the given
+ * zero-relative index to the string argument. This is equivalent
+ * to <code>remove</code>'ing the old item at the index, and then
+ * <code>add</code>'ing the new item at that index.
+ *
+ * @param index the index for the item
+ * @param string the new text for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the remove operation fails because of an operating system failure</li>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the add operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void setItem (int index, String string) {
 	checkWidget();
@@ -1014,18 +1014,18 @@ public void setItem (int index, String string) {
 	setItems (items, true, true);
 }
 
-/**

- * Sets the receiver's list to be the given array of items.

- *

- * @param items the array of items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Sets the receiver's list to be the given array of items.
+ *
+ * @param items the array of items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void setItems (String [] items) {
 	checkWidget();
@@ -1090,21 +1090,21 @@ void setItems (String [] items, boolean keepText, boolean keepSelection) {
 	if (!keepText) OS.gtk_editable_delete_text (entryHandle, 0, -1);
 }
 
-/**

- * Sets the selection in the receiver's text field to the

- * range specified by the argument whose x coordinate is the

- * start of the selection and whose y coordinate is the end

- * of the selection. 

- *

- * @param a point representing the new selection start and end

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the selection in the receiver's text field to the
+ * range specified by the argument whose x coordinate is the
+ * start of the selection and whose y coordinate is the end
+ * of the selection. 
+ *
+ * @param a point representing the new selection start and end
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSelection (Point selection) {
 	checkWidget();
@@ -1113,26 +1113,26 @@ public void setSelection (Point selection) {
 	OS.gtk_editable_select_region (entryHandle, selection.x, selection.y);
 }
 
-/**

- * Sets the contents of the receiver's text field to the

- * given string.

- * <p>

- * Note: The text field in a <code>Combo</code> is typically

- * only capable of displaying a single line of text. Thus,

- * setting the text to a string containing line breaks or

- * other special characters will probably cause it to 

- * display incorrectly.

- * </p>

- *

- * @param text the new text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the contents of the receiver's text field to the
+ * given string.
+ * <p>
+ * Note: The text field in a <code>Combo</code> is typically
+ * only capable of displaying a single line of text. Thus,
+ * setting the text to a string containing line breaks or
+ * other special characters will probably cause it to 
+ * display incorrectly.
+ * </p>
+ *
+ * @param text the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setText (String string) {
 	checkWidget();
@@ -1143,19 +1143,19 @@ public void setText (String string) {
 	OS.g_signal_handlers_unblock_matched (listHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SELECT_CHILD);
 }
 
-/**

- * Sets the maximum number of characters that the receiver's

- * text field is capable of holding to be the argument.

- *

- * @param limit new text limit

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the maximum number of characters that the receiver's
+ * text field is capable of holding to be the argument.
+ *
+ * @param limit new text limit
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setTextLimit (int limit) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index e37a86aced..fca3ed2854 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -11,28 +11,28 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
-/**

- * Instances of this class are controls which are capable

- * of containing other controls.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>NO_BACKGROUND, NO_FOCUS, NO_MERGE_PAINTS, NO_REDRAW_RESIZE, NO_RADIO_GROUP</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * Note: The <code>NO_BACKGROUND</code>, <code>NO_FOCUS</code>, <code>NO_MERGE_PAINTS</code>,

- * and <code>NO_REDRAW_RESIZE</code> styles are intended for use with <code>Canvas</code>.

- * They can be used with <code>Composite</code> if you are drawing your own, but their

- * behavior is undefined if they are used with subclasses of <code>Composite</code> other

- * than <code>Canvas</code>.

- * </p><p>

- * This class may be subclassed by custom control implementors

- * who are building controls that are constructed from aggregates

- * of other controls.

- * </p>

- *

- * @see Canvas

+/**
+ * Instances of this class are controls which are capable
+ * of containing other controls.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>NO_BACKGROUND, NO_FOCUS, NO_MERGE_PAINTS, NO_REDRAW_RESIZE, NO_RADIO_GROUP</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * Note: The <code>NO_BACKGROUND</code>, <code>NO_FOCUS</code>, <code>NO_MERGE_PAINTS</code>,
+ * and <code>NO_REDRAW_RESIZE</code> styles are intended for use with <code>Canvas</code>.
+ * They can be used with <code>Composite</code> if you are drawing your own, but their
+ * behavior is undefined if they are used with subclasses of <code>Composite</code> other
+ * than <code>Canvas</code>.
+ * </p><p>
+ * This class may be subclassed by custom control implementors
+ * who are building controls that are constructed from aggregates
+ * of other controls.
+ * </p>
+ *
+ * @see Canvas
  */
 public class Composite extends Scrollable {
 	int radioHandle, imHandle;
@@ -43,35 +43,35 @@ Composite () {
 	/* Do nothing */
 }
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a widget which will be the parent of the new instance (cannot be null)

- * @param style the style of widget to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- * </ul>

- *

- * @see SWT#NO_BACKGROUND

- * @see SWT#NO_FOCUS

- * @see SWT#NO_MERGE_PAINTS

- * @see SWT#NO_REDRAW_RESIZE

- * @see SWT#NO_RADIO_GROUP

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a widget which will be the parent of the new instance (cannot be null)
+ * @param style the style of widget to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ * </ul>
+ *
+ * @see SWT#NO_BACKGROUND
+ * @see SWT#NO_FOCUS
+ * @see SWT#NO_MERGE_PAINTS
+ * @see SWT#NO_REDRAW_RESIZE
+ * @see SWT#NO_RADIO_GROUP
+ * @see Widget#getStyle
  */
 public Composite (Composite parent, int style) {
 	super (parent, style);
@@ -104,23 +104,23 @@ Control [] _getChildren () {
 	return newChildren;
 }
 
-Control [] _getTabList () {

-	if (tabList == null) return tabList;

-	int count = 0;

-	for (int i=0; i<tabList.length; i++) {

-		if (!tabList [i].isDisposed ()) count++;

-	}

-	if (count == tabList.length) return tabList;

-	Control [] newList = new Control [count];

-	int index = 0;

-	for (int i=0; i<tabList.length; i++) {

-		if (!tabList [i].isDisposed ()) {

-			newList [index++] = tabList [i];

-		}

-	}

-	tabList = newList;

-	return tabList;

-}

+Control [] _getTabList () {
+	if (tabList == null) return tabList;
+	int count = 0;
+	for (int i=0; i<tabList.length; i++) {
+		if (!tabList [i].isDisposed ()) count++;
+	}
+	if (count == tabList.length) return tabList;
+	Control [] newList = new Control [count];
+	int index = 0;
+	for (int i=0; i<tabList.length; i++) {
+		if (!tabList [i].isDisposed ()) {
+			newList [index++] = tabList [i];
+		}
+	}
+	tabList = newList;
+	return tabList;
+}
 
 protected void checkSubclass () {
 	/* Do nothing - Subclassing is allowed */
@@ -244,36 +244,36 @@ public int getBorderWidth () {
 	return OS.gtk_container_get_border_width (topHandle);
 }
 
-/**

- * Returns an array containing the receiver's children.

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its list of children, so modifying the array will

- * not affect the receiver. 

- * </p>

- *

- * @return an array of children

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns an array containing the receiver's children.
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its list of children, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ *
+ * @return an array of children
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Control [] getChildren () {
 	checkWidget();
 	return _getChildren ();
 }
 
-/**

- * Returns layout which is associated with the receiver, or

- * null if one has not been set.

- *

- * @return the receiver's layout or null

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns layout which is associated with the receiver, or
+ * null if one has not been set.
+ *
+ * @return the receiver's layout or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Layout getLayout () {
 	checkWidget();
@@ -398,39 +398,39 @@ int imHandle () {
 	return imHandle;
 }
 
-/**

- * If the receiver has a layout, asks the layout to <em>lay out</em>

- * (that is, set the size and location of) the receiver's children. 

- * If the receiver does not have a layout, do nothing.

- * <p>

- * This is equivalent to calling <code>layout(true)</code>.

- * </p>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * If the receiver has a layout, asks the layout to <em>lay out</em>
+ * (that is, set the size and location of) the receiver's children. 
+ * If the receiver does not have a layout, do nothing.
+ * <p>
+ * This is equivalent to calling <code>layout(true)</code>.
+ * </p>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void layout () {
 	layout (true);
 }
 
-/**

- * If the receiver has a layout, asks the layout to <em>lay out</em>

- * (that is, set the size and location of) the receiver's children. 

- * If the the argument is <code>true</code> the layout must not rely

- * on any cached information it is keeping about the children. If it

- * is <code>false</code> the layout may (potentially) simplify the

- * work it is doing by assuming that the state of the none of the

- * receiver's children has changed since the last layout.

- * If the receiver does not have a layout, do nothing.

- *

- * @param changed <code>true</code> if the layout must flush its caches, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * If the receiver has a layout, asks the layout to <em>lay out</em>
+ * (that is, set the size and location of) the receiver's children. 
+ * If the the argument is <code>true</code> the layout must not rely
+ * on any cached information it is keeping about the children. If it
+ * is <code>false</code> the layout may (potentially) simplify the
+ * work it is doing by assuming that the state of the none of the
+ * receiver's children has changed since the last layout.
+ * If the receiver does not have a layout, do nothing.
+ *
+ * @param changed <code>true</code> if the layout must flush its caches, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void layout (boolean changed) {
 	checkWidget();
@@ -574,16 +574,16 @@ public boolean setFocus () {
 	return super.setFocus ();
 }
 
-/**

- * Sets the layout which is associated with the receiver to be

- * the argument which may be null.

- *

- * @param layout the receiver's new layout or null

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the layout which is associated with the receiver to be
+ * the argument which may be null.
+ *
+ * @param layout the receiver's new layout or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLayout (Layout layout) {
 	checkWidget();
@@ -617,20 +617,20 @@ boolean setTabItemFocus () {
 	return super.setTabItemFocus ();
 }
 
-/**

- * Sets the tabbing order for the specified controls to

- * match the order that they occur in the argument list.

- *

- * @param tabList the ordered list of controls representing the tab order or null

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if a widget in the tabList is null or has been disposed</li> 

- *    <li>ERROR_INVALID_PARENT - if widget in the tabList is not in the same widget tree</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the tabbing order for the specified controls to
+ * match the order that they occur in the argument list.
+ *
+ * @param tabList the ordered list of controls representing the tab order or null
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if a widget in the tabList is null or has been disposed</li> 
+ *    <li>ERROR_INVALID_PARENT - if widget in the tabList is not in the same widget tree</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setTabList (Control [] tabList) {
 	checkWidget ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 842909ebc0..48a06d439e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -14,20 +14,20 @@ import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.accessibility.*;
 
-/**

- * Control is the abstract superclass of all windowed user interface classes.

- * <p>

- * <dl>

- * <dt><b>Styles:</b>

- * <dd>BORDER</dd>

- * <dt><b>Events:</b>

- * <dd>FocusIn, FocusOut, Help, KeyDown, KeyUp, MouseDoubleClick, MouseDown, MouseEnter,

- *     MouseExit, MouseHover, MouseUp, MouseMove, Move, Paint, Resize</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+/**
+ * Control is the abstract superclass of all windowed user interface classes.
+ * <p>
+ * <dl>
+ * <dt><b>Styles:</b>
+ * <dd>BORDER</dd>
+ * <dt><b>Events:</b>
+ * <dd>FocusIn, FocusOut, Help, KeyDown, KeyUp, MouseDoubleClick, MouseDown, MouseEnter,
+ *     MouseExit, MouseHover, MouseUp, MouseMove, Move, Paint, Resize</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
 public abstract class Control extends Widget implements Drawable {
 	int fixedHandle;
@@ -41,33 +41,33 @@ public abstract class Control extends Widget implements Drawable {
 Control () {
 }
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#BORDER

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#BORDER
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Control (Composite parent, int style) {
 	super (parent, style);
@@ -199,32 +199,32 @@ int paintWindow () {
 	return OS.GTK_WIDGET_WINDOW (paintHandle);
 }
 
-/**

- * Returns the preferred size of the receiver.

- * <p>

- * The <em>preferred size</em> of a control is the size that it would

- * best be displayed at. The width hint and height hint arguments

- * allow the caller to ask a control questions such as "Given a particular

- * width, how high does the control need to be to show all of the contents?"

- * To indicate that the caller does not wish to constrain a particular 

- * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 

- * </p>

- *

- * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)

- * @param hHint the height hint (can be <code>SWT.DEFAULT</code>)

- * @return the preferred size of the control

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see Layout

- * @see #getBorderWidth

- * @see #getBounds

- * @see #getSize

- * @see #pack

- * @see "computeTrim, getClientArea for controls that implement them"

+/**
+ * Returns the preferred size of the receiver.
+ * <p>
+ * The <em>preferred size</em> of a control is the size that it would
+ * best be displayed at. The width hint and height hint arguments
+ * allow the caller to ask a control questions such as "Given a particular
+ * width, how high does the control need to be to show all of the contents?"
+ * To indicate that the caller does not wish to constrain a particular 
+ * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 
+ * </p>
+ *
+ * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)
+ * @param hHint the height hint (can be <code>SWT.DEFAULT</code>)
+ * @return the preferred size of the control
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see Layout
+ * @see #getBorderWidth
+ * @see #getBounds
+ * @see #getSize
+ * @see #pack
+ * @see "computeTrim, getClientArea for controls that implement them"
  */
 public Point computeSize (int wHint, int hHint) {
 	return computeSize (wHint, hHint, true);
@@ -266,39 +266,39 @@ void createWidget (int index) {
 	setZOrder (null, false);
 }
 
-/**

- * Returns the preferred size of the receiver.

- * <p>

- * The <em>preferred size</em> of a control is the size that it would

- * best be displayed at. The width hint and height hint arguments

- * allow the caller to ask a control questions such as "Given a particular

- * width, how high does the control need to be to show all of the contents?"

- * To indicate that the caller does not wish to constrain a particular 

- * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 

- * </p><p>

- * If the changed flag is <code>true</code>, it indicates that the receiver's

- * <em>contents</em> have changed, therefore any caches that a layout manager

- * containing the control may have been keeping need to be flushed. When the

- * control is resized, the changed flag will be <code>false</code>, so layout

- * manager caches can be retained. 

- * </p>

- *

- * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)

- * @param hHint the height hint (can be <code>SWT.DEFAULT</code>)

- * @param changed <code>true</code> if the control's contents have changed, and <code>false</code> otherwise

- * @return the preferred size of the control.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see Layout

- * @see #getBorderWidth

- * @see #getBounds

- * @see #getSize

- * @see #pack

- * @see "computeTrim, getClientArea for controls that implement them"

+/**
+ * Returns the preferred size of the receiver.
+ * <p>
+ * The <em>preferred size</em> of a control is the size that it would
+ * best be displayed at. The width hint and height hint arguments
+ * allow the caller to ask a control questions such as "Given a particular
+ * width, how high does the control need to be to show all of the contents?"
+ * To indicate that the caller does not wish to constrain a particular 
+ * dimension, the constant <code>SWT.DEFAULT</code> is passed for the hint. 
+ * </p><p>
+ * If the changed flag is <code>true</code>, it indicates that the receiver's
+ * <em>contents</em> have changed, therefore any caches that a layout manager
+ * containing the control may have been keeping need to be flushed. When the
+ * control is resized, the changed flag will be <code>false</code>, so layout
+ * manager caches can be retained. 
+ * </p>
+ *
+ * @param wHint the width hint (can be <code>SWT.DEFAULT</code>)
+ * @param hHint the height hint (can be <code>SWT.DEFAULT</code>)
+ * @param changed <code>true</code> if the control's contents have changed, and <code>false</code> otherwise
+ * @return the preferred size of the control.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see Layout
+ * @see #getBorderWidth
+ * @see #getBounds
+ * @see #getSize
+ * @see #pack
+ * @see "computeTrim, getClientArea for controls that implement them"
  */
 public Point computeSize (int wHint, int hHint, boolean changed) {
 	checkWidget();
@@ -317,22 +317,22 @@ Point computeNativeSize (int h, int wHint, int hHint, boolean changed) {
 	return new Point (width, height);	
 }
 
-/**

- * Returns the accessible object for the receiver.

- * If this is the first time this object is requested,

- * then the object is created and returned.

- *

- * @return the accessible object

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @see Accessible#addAccessibleListener

- * @see Accessible#addAccessibleControlListener

- * 

- * @since 2.0

+/**
+ * Returns the accessible object for the receiver.
+ * If this is the first time this object is requested,
+ * then the object is created and returned.
+ *
+ * @return the accessible object
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see Accessible#addAccessibleListener
+ * @see Accessible#addAccessibleControlListener
+ * 
+ * @since 2.0
  */
 public Accessible getAccessible () {
 	checkWidget ();
@@ -342,16 +342,16 @@ public Accessible getAccessible () {
 	return accessible;
 }
 
-/**

- * Returns a rectangle describing the receiver's size and location

- * relative to its parent (or its display if its parent is null).

- *

- * @return the receiver's bounding rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a rectangle describing the receiver's size and location
+ * relative to its parent (or its display if its parent is null).
+ *
+ * @return the receiver's bounding rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Rectangle getBounds () {
 	checkWidget();
@@ -363,23 +363,23 @@ public Rectangle getBounds () {
 	return new Rectangle (x, y, width, height);
 }
 
-/**

- * Sets the receiver's size and location to the rectangular

- * area specified by the argument. The <code>x</code> and 

- * <code>y</code> fields of the rectangle are relative to

- * the receiver's parent (or its display if its parent is null).

- * <p>

- * Note: Attempting to set the width or height of the

- * receiver to a negative number will cause that

- * value to be set to zero instead.

- * </p>

- *

- * @param rect the new bounds for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size and location to the rectangular
+ * area specified by the argument. The <code>x</code> and 
+ * <code>y</code> fields of the rectangle are relative to
+ * the receiver's parent (or its display if its parent is null).
+ * <p>
+ * Note: Attempting to set the width or height of the
+ * receiver to a negative number will cause that
+ * value to be set to zero instead.
+ * </p>
+ *
+ * @param rect the new bounds for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setBounds (Rectangle rect) {
 	checkWidget ();
@@ -387,26 +387,26 @@ public void setBounds (Rectangle rect) {
 	setBounds (rect.x, rect.y, rect.width, rect.height);
 }
 
-/**

- * Sets the receiver's size and location to the rectangular

- * area specified by the arguments. The <code>x</code> and 

- * <code>y</code> arguments are relative to the receiver's

- * parent (or its display if its parent is null).

- * <p>

- * Note: Attempting to set the width or height of the

- * receiver to a negative number will cause that

- * value to be set to zero instead.

- * </p>

- *

- * @param x the new x coordinate for the receiver

- * @param y the new y coordinate for the receiver

- * @param width the new width for the receiver

- * @param height the new height for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size and location to the rectangular
+ * area specified by the arguments. The <code>x</code> and 
+ * <code>y</code> arguments are relative to the receiver's
+ * parent (or its display if its parent is null).
+ * <p>
+ * Note: Attempting to set the width or height of the
+ * receiver to a negative number will cause that
+ * value to be set to zero instead.
+ * </p>
+ *
+ * @param x the new x coordinate for the receiver
+ * @param y the new y coordinate for the receiver
+ * @param width the new width for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setBounds (int x, int y, int width, int height) {
 	checkWidget();
@@ -478,16 +478,16 @@ boolean setBounds (int x, int y, int width, int height, boolean move, boolean re
 	return !sameOrigin || !sameExtent;
 }
 
-/**

- * Returns a point describing the receiver's location relative

- * to its parent (or its display if its parent is null).

- *

- * @return the receiver's location

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point describing the receiver's location relative
+ * to its parent (or its display if its parent is null).
+ *
+ * @return the receiver's location
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getLocation () {
 	checkWidget();
@@ -497,17 +497,17 @@ public Point getLocation () {
 	return new Point (x, y);
 }
 
-/**

- * Sets the receiver's location to the point specified by

- * the argument which is relative to the receiver's

- * parent (or its display if its parent is null).

- *

- * @param location the new location for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's location to the point specified by
+ * the argument which is relative to the receiver's
+ * parent (or its display if its parent is null).
+ *
+ * @param location the new location for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLocation (Point location) {
 	checkWidget ();
@@ -515,36 +515,36 @@ public void setLocation (Point location) {
 	setLocation (location.x, location.y);
 }
 
-/**

- * Sets the receiver's location to the point specified by

- * the arguments which are relative to the receiver's

- * parent (or its display if its parent is null).

- *

- * @param x the new x coordinate for the receiver

- * @param y the new y coordinate for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's location to the point specified by
+ * the arguments which are relative to the receiver's
+ * parent (or its display if its parent is null).
+ *
+ * @param x the new x coordinate for the receiver
+ * @param y the new y coordinate for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLocation(int x, int y) {
 	checkWidget();
 	setBounds (x, y, 0, 0, true, false);
 }
 
-/**

- * Returns a point describing the receiver's size. The

- * x coordinate of the result is the width of the receiver.

- * The y coordinate of the result is the height of the

- * receiver.

- *

- * @return the receiver's size

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point describing the receiver's size. The
+ * x coordinate of the result is the width of the receiver.
+ * The y coordinate of the result is the height of the
+ * receiver.
+ *
+ * @return the receiver's size
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getSize () {
 	checkWidget();
@@ -554,24 +554,24 @@ public Point getSize () {
 	return new Point (width, height);
 }
 
-/**

- * Sets the receiver's size to the point specified by the argument.

- * <p>

- * Note: Attempting to set the width or height of the

- * receiver to a negative number will cause them to be

- * set to zero instead.

- * </p>

- *

- * @param size the new size for the receiver

- * @param height the new height for the receiver

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size to the point specified by the argument.
+ * <p>
+ * Note: Attempting to set the width or height of the
+ * receiver to a negative number will cause them to be
+ * set to zero instead.
+ * </p>
+ *
+ * @param size the new size for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSize (Point size) {
 	checkWidget ();
@@ -579,43 +579,43 @@ public void setSize (Point size) {
 	setSize (size.x, size.y);
 }
 
-/**

- * Sets the receiver's size to the point specified by the arguments.

- * <p>

- * Note: Attempting to set the width or height of the

- * receiver to a negative number will cause that

- * value to be set to zero instead.

- * </p>

- *

- * @param width the new width for the receiver

- * @param height the new height for the receiver

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's size to the point specified by the arguments.
+ * <p>
+ * Note: Attempting to set the width or height of the
+ * receiver to a negative number will cause that
+ * value to be set to zero instead.
+ * </p>
+ *
+ * @param width the new width for the receiver
+ * @param height the new height for the receiver
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSize (int width, int height) {
 	checkWidget();
 	setBounds (0, 0, width, height, false, true);
 }
 
-/**

- * Moves the receiver above the specified control in the

- * drawing order. If the argument is null, then the receiver

- * is moved to the top of the drawing order. The control at

- * the top of the drawing order will not be covered by other

- * controls even if they occupy intersecting areas.

- *

- * @param the sibling control (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Moves the receiver above the specified control in the
+ * drawing order. If the argument is null, then the receiver
+ * is moved to the top of the drawing order. The control at
+ * the top of the drawing order will not be covered by other
+ * controls even if they occupy intersecting areas.
+ *
+ * @param the sibling control (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void moveAbove (Control control) {
 	checkWidget();
@@ -626,22 +626,22 @@ public void moveAbove (Control control) {
 	setZOrder (control, true);
 }
 
-/**

- * Moves the receiver below the specified control in the

- * drawing order. If the argument is null, then the receiver

- * is moved to the bottom of the drawing order. The control at

- * the bottom of the drawing order will be covered by all other

- * controls which occupy intersecting areas.

- *

- * @param the sibling control (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Moves the receiver below the specified control in the
+ * drawing order. If the argument is null, then the receiver
+ * is moved to the bottom of the drawing order. The control at
+ * the bottom of the drawing order will be covered by all other
+ * controls which occupy intersecting areas.
+ *
+ * @param the sibling control (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void moveBelow (Control control) {
 	checkWidget();
@@ -652,54 +652,54 @@ public void moveBelow (Control control) {
 	setZOrder (control, false);
 }
 
-/**

- * Causes the receiver to be resized to its preferred size.

- * For a composite, this involves computing the preferred size

- * from its layout, if there is one.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #computeSize

+/**
+ * Causes the receiver to be resized to its preferred size.
+ * For a composite, this involves computing the preferred size
+ * from its layout, if there is one.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #computeSize
  */
 public void pack () {
 	pack (true);
 }
 
-/**

- * Causes the receiver to be resized to its preferred size.

- * For a composite, this involves computing the preferred size

- * from its layout, if there is one.

- * <p>

- * If the changed flag is <code>true</code>, it indicates that the receiver's

- * <em>contents</em> have changed, therefore any caches that a layout manager

- * containing the control may have been keeping need to be flushed. When the

- * control is resized, the changed flag will be <code>false</code>, so layout

- * manager caches can be retained. 

- * </p>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #computeSize

+/**
+ * Causes the receiver to be resized to its preferred size.
+ * For a composite, this involves computing the preferred size
+ * from its layout, if there is one.
+ * <p>
+ * If the changed flag is <code>true</code>, it indicates that the receiver's
+ * <em>contents</em> have changed, therefore any caches that a layout manager
+ * containing the control may have been keeping need to be flushed. When the
+ * control is resized, the changed flag will be <code>false</code>, so layout
+ * manager caches can be retained. 
+ * </p>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #computeSize
  */
 public void pack (boolean changed) {
 	setSize (computeSize (SWT.DEFAULT, SWT.DEFAULT, changed));
 }
 
-/**

- * Sets the layout data associated with the receiver to the argument.

- * 

- * @param layoutData the new layout data for the receiver.

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the layout data associated with the receiver to the argument.
+ * 
+ * @param layoutData the new layout data for the receiver.
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setLayoutData (Object layoutData) {
 	checkWidget();
@@ -715,20 +715,20 @@ public Point toControl (int x, int y) {
 	return new Point (x - origin_x [0], y - origin_y [0]);
 }
 
-/**

- * Returns a point which is the result of converting the

- * argument, which is specified in display relative coordinates,

- * to coordinates relative to the receiver.

- * <p>

- * @param point the point to be translated (must not be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point which is the result of converting the
+ * argument, which is specified in display relative coordinates,
+ * to coordinates relative to the receiver.
+ * <p>
+ * @param point the point to be translated (must not be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point toControl (Point point) {
 	checkWidget ();
@@ -745,20 +745,20 @@ public Point toDisplay (int x, int y) {
 	return new Point (origin_x [0] + x, origin_y [0] + y);
 }
 
-/**

- * Returns a point which is the result of converting the

- * argument, which is specified in coordinates relative to

- * the receiver, to display relative coordinates.

- * <p>

- * @param point the point to be translated (must not be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a point which is the result of converting the
+ * argument, which is specified in coordinates relative to
+ * the receiver, to display relative coordinates.
+ * <p>
+ * @param point the point to be translated (must not be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point toDisplay (Point point) {
 	checkWidget();
@@ -766,24 +766,24 @@ public Point toDisplay (Point point) {
 	return toDisplay (point.x, point.y);
 }
  
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the control is moved or resized, by sending

- * it one of the messages defined in the <code>ControlListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ControlListener

- * @see #removeControlListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control is moved or resized, by sending
+ * it one of the messages defined in the <code>ControlListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ControlListener
+ * @see #removeControlListener
  */
 public void addControlListener(ControlListener listener) {
 	checkWidget();
@@ -793,24 +793,24 @@ public void addControlListener(ControlListener listener) {
 	addListener (SWT.Move,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the control gains or loses focus, by sending

- * it one of the messages defined in the <code>FocusListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see FocusListener

- * @see #removeFocusListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control gains or loses focus, by sending
+ * it one of the messages defined in the <code>FocusListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see FocusListener
+ * @see #removeFocusListener
  */
 public void addFocusListener(FocusListener listener) {
 	checkWidget();
@@ -820,24 +820,24 @@ public void addFocusListener(FocusListener listener) {
 	addListener(SWT.FocusOut,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when help events are generated for the control,

- * by sending it one of the messages defined in the

- * <code>HelpListener</code> interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see HelpListener

- * @see #removeHelpListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when help events are generated for the control,
+ * by sending it one of the messages defined in the
+ * <code>HelpListener</code> interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see HelpListener
+ * @see #removeHelpListener
  */
 public void addHelpListener (HelpListener listener) {
 	checkWidget();
@@ -846,24 +846,24 @@ public void addHelpListener (HelpListener listener) {
 	addListener (SWT.Help, typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when keys are pressed and released on the system keyboard, by sending

- * it one of the messages defined in the <code>KeyListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see KeyListener

- * @see #removeKeyListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when keys are pressed and released on the system keyboard, by sending
+ * it one of the messages defined in the <code>KeyListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see KeyListener
+ * @see #removeKeyListener
  */
 public void addKeyListener(KeyListener listener) {
 	checkWidget();
@@ -873,24 +873,24 @@ public void addKeyListener(KeyListener listener) {
 	addListener(SWT.KeyDown,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when mouse buttons are pressed and released, by sending

- * it one of the messages defined in the <code>MouseListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseListener

- * @see #removeMouseListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when mouse buttons are pressed and released, by sending
+ * it one of the messages defined in the <code>MouseListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseListener
+ * @see #removeMouseListener
  */
 public void addMouseListener(MouseListener listener) {
 	checkWidget();
@@ -901,24 +901,24 @@ public void addMouseListener(MouseListener listener) {
 	addListener(SWT.MouseDoubleClick,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the mouse moves, by sending it one of the

- * messages defined in the <code>MouseMoveListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseMoveListener

- * @see #removeMouseMoveListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the mouse moves, by sending it one of the
+ * messages defined in the <code>MouseMoveListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseMoveListener
+ * @see #removeMouseMoveListener
  */
 public void addMouseMoveListener(MouseMoveListener listener) {
 	checkWidget();
@@ -927,24 +927,24 @@ public void addMouseMoveListener(MouseMoveListener listener) {
 	addListener(SWT.MouseMove,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the mouse passes or hovers over controls, by sending

- * it one of the messages defined in the <code>MouseTrackListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseTrackListener

- * @see #removeMouseTrackListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the mouse passes or hovers over controls, by sending
+ * it one of the messages defined in the <code>MouseTrackListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseTrackListener
+ * @see #removeMouseTrackListener
  */
 public void addMouseTrackListener (MouseTrackListener listener) {
 	checkWidget();
@@ -955,24 +955,24 @@ public void addMouseTrackListener (MouseTrackListener listener) {
 	addListener (SWT.MouseHover,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the receiver needs to be painted, by sending it

- * one of the messages defined in the <code>PaintListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see PaintListener

- * @see #removePaintListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver needs to be painted, by sending it
+ * one of the messages defined in the <code>PaintListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see PaintListener
+ * @see #removePaintListener
  */
 public void addPaintListener(PaintListener listener) {
 	checkWidget();
@@ -981,24 +981,24 @@ public void addPaintListener(PaintListener listener) {
 	addListener(SWT.Paint,typedListener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when traversal events occur, by sending it

- * one of the messages defined in the <code>TraverseListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see TraverseListener

- * @see #removeTraverseListener

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when traversal events occur, by sending it
+ * one of the messages defined in the <code>TraverseListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see TraverseListener
+ * @see #removeTraverseListener
  */
 public void addTraverseListener (TraverseListener listener) {
 	checkWidget();
@@ -1007,22 +1007,22 @@ public void addTraverseListener (TraverseListener listener) {
 	addListener (SWT.Traverse,typedListener);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the control is moved or resized.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ControlListener

- * @see #addControlListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control is moved or resized.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ControlListener
+ * @see #addControlListener
  */
 public void removeControlListener (ControlListener listener) {
 	checkWidget();
@@ -1031,22 +1031,22 @@ public void removeControlListener (ControlListener listener) {
 	eventTable.unhook (SWT.Move, listener);
 	eventTable.unhook (SWT.Resize, listener);
 }
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the control gains or loses focus.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see FocusListener

- * @see #addFocusListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control gains or loses focus.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see FocusListener
+ * @see #addFocusListener
  */
 public void removeFocusListener(FocusListener listener) {
 	checkWidget();
@@ -1055,22 +1055,22 @@ public void removeFocusListener(FocusListener listener) {
 	eventTable.unhook (SWT.FocusIn, listener);
 	eventTable.unhook (SWT.FocusOut, listener);
 }
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the help events are generated for the control.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see HelpListener

- * @see #addHelpListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the help events are generated for the control.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see HelpListener
+ * @see #addHelpListener
  */
 public void removeHelpListener (HelpListener listener) {
 	checkWidget();
@@ -1078,22 +1078,22 @@ public void removeHelpListener (HelpListener listener) {
 	if (eventTable == null) return;
 	eventTable.unhook (SWT.Help, listener);
 }
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when keys are pressed and released on the system keyboard.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see KeyListener

- * @see #addKeyListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when keys are pressed and released on the system keyboard.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see KeyListener
+ * @see #addKeyListener
  */
 public void removeKeyListener(KeyListener listener) {
 	checkWidget();
@@ -1102,22 +1102,22 @@ public void removeKeyListener(KeyListener listener) {
 	eventTable.unhook (SWT.KeyUp, listener);
 	eventTable.unhook (SWT.KeyDown, listener);
 }
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when mouse buttons are pressed and released.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseListener

- * @see #addMouseListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when mouse buttons are pressed and released.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseListener
+ * @see #addMouseListener
  */
 public void removeMouseListener (MouseListener listener) {
 	checkWidget();
@@ -1127,22 +1127,22 @@ public void removeMouseListener (MouseListener listener) {
 	eventTable.unhook (SWT.MouseUp, listener);
 	eventTable.unhook (SWT.MouseDoubleClick, listener);
 }
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the mouse moves.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseMoveListener

- * @see #addMouseMoveListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the mouse moves.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseMoveListener
+ * @see #addMouseMoveListener
  */
 public void removeMouseMoveListener(MouseMoveListener listener) {
 	checkWidget();
@@ -1151,22 +1151,22 @@ public void removeMouseMoveListener(MouseMoveListener listener) {
 	eventTable.unhook (SWT.MouseMove, listener);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the mouse passes or hovers over controls.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see MouseTrackListener

- * @see #addMouseTrackListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the mouse passes or hovers over controls.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see MouseTrackListener
+ * @see #addMouseTrackListener
  */
 public void removeMouseTrackListener(MouseTrackListener listener) {
 	checkWidget();
@@ -1177,22 +1177,22 @@ public void removeMouseTrackListener(MouseTrackListener listener) {
 	eventTable.unhook (SWT.MouseHover, listener);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the receiver needs to be painted.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see PaintListener

- * @see #addPaintListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the receiver needs to be painted.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see PaintListener
+ * @see #addPaintListener
  */
 public void removePaintListener(PaintListener listener) {
 	checkWidget();
@@ -1201,22 +1201,22 @@ public void removePaintListener(PaintListener listener) {
 	eventTable.unhook(SWT.Paint, listener);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when traversal events occur.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see TraverseListener

- * @see #addTraverseListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when traversal events occur.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see TraverseListener
+ * @see #addTraverseListener
  */
 public void removeTraverseListener(TraverseListener listener) {
 	checkWidget ();
@@ -1226,18 +1226,18 @@ public void removeTraverseListener(TraverseListener listener) {
 }
 
 
-/**

- * Forces the receiver to have the <em>keyboard focus</em>, causing

- * all keyboard events to be delivered to it.

- *

- * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setFocus

+/**
+ * Forces the receiver to have the <em>keyboard focus</em>, causing
+ * all keyboard events to be delivered to it.
+ *
+ * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setFocus
  */
 public boolean forceFocus () {
 	checkWidget();
@@ -1249,15 +1249,15 @@ public boolean forceFocus () {
 	return OS.gtk_widget_is_focus (handle);
 }
 
-/**

- * Returns the receiver's background color.

- *

- * @return the background color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's background color.
+ *
+ * @return the background color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Color getBackground () {
 	checkWidget();
@@ -1292,30 +1292,30 @@ GdkColor getBaseColor () {
 	return color;
 }
 
-/**

- * Returns the receiver's border width.

- *

- * @return the border width

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's border width.
+ *
+ * @return the border width
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getBorderWidth () {
 	checkWidget();
 	return 0;
 }
 
-/**

- * Returns the display that the receiver was created on.

- *

- * @return the receiver's display

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the display that the receiver was created on.
+ *
+ * @return the receiver's display
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Display getDisplay () {
 	if (parent == null) {
@@ -1323,33 +1323,33 @@ public Display getDisplay () {
 	}
 	return parent.getDisplay ();
 }
-/**

- * Returns <code>true</code> if the receiver is enabled, and

- * <code>false</code> otherwise. A disabled control is typically

- * not selectable from the user interface and draws with an

- * inactive or "grayed" look.

- *

- * @return the receiver's enabled state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver is enabled, and
+ * <code>false</code> otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ *
+ * @return the receiver's enabled state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean getEnabled () {
 	checkWidget ();
 	return (state & DISABLED) == 0;
 }
 
-/**

- * Returns the font that the receiver will use to paint textual information.

- *

- * @return the receiver's font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the font that the receiver will use to paint textual information.
+ *
+ * @return the receiver's font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Font getFont () {
 	checkWidget();
@@ -1364,15 +1364,15 @@ int getFontDescription () {
 	return style.font_desc;
 }
 
-/**

- * Returns the foreground color that the receiver will use to draw.

- *

- * @return the receiver's foreground color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the foreground color that the receiver will use to draw.
+ *
+ * @return the receiver's foreground color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Color getForeground () {
 	checkWidget();
@@ -1411,51 +1411,51 @@ GdkColor getTextColor () {
 	return color;
 }
 
-/**

- * Returns layout data which is associated with the receiver.

- *

- * @return the receiver's layout data

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns layout data which is associated with the receiver.
+ *
+ * @return the receiver's layout data
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Object getLayoutData () {
 	checkWidget();
 	return layoutData;
 }
 
-/**

- * Returns the receiver's pop up menu if it has one, or null

- * if it does not. All controls may optionally have a pop up

- * menu that is displayed when the user requests one for

- * the control. The sequence of key strokes, button presses

- * and/or button releases that are used to request a pop up

- * menu is platform specific.

- *

- * @return the receiver's menu

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's pop up menu if it has one, or null
+ * if it does not. All controls may optionally have a pop up
+ * menu that is displayed when the user requests one for
+ * the control. The sequence of key strokes, button presses
+ * and/or button releases that are used to request a pop up
+ * menu is platform specific.
+ *
+ * @return the receiver's menu
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Menu getMenu () {
 	checkWidget();
 	return menu;
 }
-/**

- * Returns the receiver's parent, which must be a <code>Composite</code>

- * or null when the receiver is a shell that was created with null or

- * a display for a parent.

- *

- * @return the receiver's parent

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's parent, which must be a <code>Composite</code>
+ * or null when the receiver is a shell that was created with null or
+ * a display for a parent.
+ *
+ * @return the receiver's parent
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Composite getParent () {
 	checkWidget();
@@ -1479,20 +1479,20 @@ Control [] getPath () {
 	return result;
 }
 
-/**

- * Returns the receiver's shell. For all controls other than

- * shells, this simply returns the control's nearest ancestor

- * shell. Shells return themselves, even if they are children

- * of other shells.

- *

- * @return the receiver's shell

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #getParent

+/**
+ * Returns the receiver's shell. For all controls other than
+ * shells, this simply returns the control's nearest ancestor
+ * shell. Shells return themselves, even if they are children
+ * of other shells.
+ *
+ * @return the receiver's shell
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #getParent
  */
 public Shell getShell() {
 	checkWidget();
@@ -1502,37 +1502,37 @@ Shell _getShell() {
 	return parent._getShell();
 }
 
-/**

- * Returns the receiver's tool tip text, or null if it has

- * not been set.

- *

- * @return the receiver's tool tip text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's tool tip text, or null if it has
+ * not been set.
+ *
+ * @return the receiver's tool tip text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public String getToolTipText () {
 	checkWidget();
 	return toolTipText;
 }
-/**

- * Returns <code>true</code> if the receiver is visible, and

- * <code>false</code> otherwise.

- * <p>

- * If one of the receiver's ancestors is not visible or some

- * other condition makes the receiver not visible, this method

- * may still indicate that it is considered visible even though

- * it may not actually be showing.

- * </p>

- *

- * @return the receiver's visibility state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver is visible, and
+ * <code>false</code> otherwise.
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, this method
+ * may still indicate that it is considered visible even though
+ * it may not actually be showing.
+ * </p>
+ *
+ * @return the receiver's visibility state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean getVisible () {
 	checkWidget();
@@ -1778,20 +1778,20 @@ int gtk_show_help (int widget, int helpType) {
 	return 0;
 }
 
-/**	 

- * Invokes platform specific functionality to allocate a new GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Control</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param data the platform specific GC data 

- * @return the platform specific GC handle

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to allocate a new GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Control</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param data the platform specific GC data 
+ * @return the platform specific GC handle
+ *
+ * @private
  */
 public int internal_new_GC (GCData data) {
 	checkWidget ();
@@ -1826,36 +1826,36 @@ int imHandle () {
 	return 0;
 }
 
-/**	 

- * Invokes platform specific functionality to dispose a GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Control</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param handle the platform specific GC handle

- * @param data the platform specific GC data 

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to dispose a GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Control</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param handle the platform specific GC handle
+ * @param data the platform specific GC data 
+ *
+ * @private
  */
 public void internal_dispose_GC (int gdkGC, GCData data) {
 	checkWidget ();
 	OS.g_object_unref (gdkGC);
 }
 
-/**

- * Returns <code>true</code> if the underlying operating

- * system supports this reparenting, otherwise <code>false</code>

- *

- * @return <code>true</code> if the widget can be reparented, otherwise <code>false</code>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the underlying operating
+ * system supports this reparenting, otherwise <code>false</code>
+ *
+ * @return <code>true</code> if the widget can be reparented, otherwise <code>false</code>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean isReparentable () {
 	checkWidget();
@@ -1928,16 +1928,16 @@ boolean isFocusAncestor () {
 	return control == this;
 }
 
-/**

- * Returns <code>true</code> if the receiver has the user-interface

- * focus, and <code>false</code> otherwise.

- *

- * @return the receiver's focus state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the receiver has the user-interface
+ * focus, and <code>false</code> otherwise.
+ *
+ * @return the receiver's focus state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean isFocusControl () {
 	checkWidget();
@@ -1975,17 +1975,17 @@ void register () {
 }
 
 
-/**

- * Causes the entire bounds of the receiver to be marked

- * as needing to be redrawn. The next time a paint request

- * is processed, the control will be completely painted.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #update

+/**
+ * Causes the entire bounds of the receiver to be marked
+ * as needing to be redrawn. The next time a paint request
+ * is processed, the control will be completely painted.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #update
  */
 public void redraw () {
 	checkWidget();
@@ -1994,28 +1994,28 @@ public void redraw () {
 	int height = OS.GTK_WIDGET_HEIGHT (paintHandle);
 	redrawWidget (0, 0, width, height, true);
 }
-/**

- * Causes the rectangular area of the receiver specified by

- * the arguments to be marked as needing to be redrawn. 

- * The next time a paint request is processed, that area of

- * the receiver will be painted. If the <code>all</code> flag

- * is <code>true</code>, any children of the receiver which

- * intersect with the specified area will also paint their

- * intersecting areas. If the <code>all</code> flag is 

- * <code>false</code>, the children will not be painted.

- *

- * @param x the x coordinate of the area to draw

- * @param y the y coordinate of the area to draw

- * @param width the width of the area to draw

- * @param height the height of the area to draw

- * @param all <code>true</code> if children should redraw, and <code>false</code> otherwise

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #update

+/**
+ * Causes the rectangular area of the receiver specified by
+ * the arguments to be marked as needing to be redrawn. 
+ * The next time a paint request is processed, that area of
+ * the receiver will be painted. If the <code>all</code> flag
+ * is <code>true</code>, any children of the receiver which
+ * intersect with the specified area will also paint their
+ * intersecting areas. If the <code>all</code> flag is 
+ * <code>false</code>, the children will not be painted.
+ *
+ * @param x the x coordinate of the area to draw
+ * @param y the y coordinate of the area to draw
+ * @param width the width of the area to draw
+ * @param height the height of the area to draw
+ * @param all <code>true</code> if children should redraw, and <code>false</code> otherwise
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #update
  */
 public void redraw (int x, int y, int width, int height, boolean all) {
 	checkWidget();
@@ -2100,20 +2100,20 @@ void sendMouseEvent (int type, int button, int gdkEvent) {
 	postEvent (type, event);
 }
 
-/**

- * Sets the receiver's background color to the color specified

- * by the argument, or to the default system color for the control

- * if the argument is null.

- *

- * @param color the new color (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's background color to the color specified
+ * by the argument, or to the default system color for the control
+ * if the argument is null.
+ *
+ * @param color the new color (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setBackground (Color color) {
 	checkWidget();
@@ -2131,17 +2131,17 @@ void setBackgroundColor (GdkColor color) {
 	OS.gtk_widget_modify_bg (handle, 0, color);
 }
 
-/**

- * If the argument is <code>true</code>, causes the receiver to have

- * all mouse events delivered to it until the method is called with

- * <code>false</code> as the argument.

- *

- * @param capture <code>true</code> to capture the mouse, and <code>false</code> to release it

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * If the argument is <code>true</code>, causes the receiver to have
+ * all mouse events delivered to it until the method is called with
+ * <code>false</code> as the argument.
+ *
+ * @param capture <code>true</code> to capture the mouse, and <code>false</code> to release it
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setCapture (boolean capture) {
 	checkWidget();
@@ -2154,24 +2154,24 @@ public void setCapture (boolean capture) {
 	}
 	*/
 }
-/**

- * Sets the receiver's cursor to the cursor specified by the

- * argument, or to the default cursor for that kind of control

- * if the argument is null.

- * <p>

- * When the mouse pointer passes over a control its appearance

- * is changed to match the control's cursor.

- * </p>

- *

- * @param cursor the new cursor (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's cursor to the cursor specified by the
+ * argument, or to the default cursor for that kind of control
+ * if the argument is null.
+ * <p>
+ * When the mouse pointer passes over a control its appearance
+ * is changed to match the control's cursor.
+ * </p>
+ *
+ * @param cursor the new cursor (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setCursor (Cursor cursor) {
 	checkWidget();
@@ -2186,18 +2186,18 @@ public void setCursor (Cursor cursor) {
 	}
 }
 
-/**

- * Enables the receiver if the argument is <code>true</code>,

- * and disables it otherwise. A disabled control is typically

- * not selectable from the user interface and draws with an

- * inactive or "grayed" look.

- *

- * @param enabled the new enabled state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Enables the receiver if the argument is <code>true</code>,
+ * and disables it otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ *
+ * @param enabled the new enabled state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setEnabled (boolean enabled) {
 	checkWidget();
@@ -2213,38 +2213,38 @@ public void setEnabled (boolean enabled) {
 	if (fixFocus) fixFocus ();
 }
 
-/**

- * Causes the receiver to have the <em>keyboard focus</em>, 

- * such that all keyboard events will be delivered to it.

- *

- * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #forceFocus

+/**
+ * Causes the receiver to have the <em>keyboard focus</em>, 
+ * such that all keyboard events will be delivered to it.
+ *
+ * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #forceFocus
  */
 public boolean setFocus () {
 	checkWidget();
 	return forceFocus ();
 }
 
-/**

- * Sets the font that the receiver will use to paint textual information

- * to the font specified by the argument, or to the default font for that

- * kind of control if the argument is null.

- *

- * @param font the new font (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the font that the receiver will use to paint textual information
+ * to the font specified by the argument, or to the default font for that
+ * kind of control if the argument is null.
+ *
+ * @param font the new font (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setFont (Font font) {
 	checkWidget();
@@ -2263,20 +2263,20 @@ void setFontDescription (int font) {
 	OS.gtk_widget_modify_font (handle, font);
 }
 
-/**

- * Sets the receiver's foreground color to the color specified

- * by the argument, or to the default system color for the control

- * if the argument is null.

- *

- * @param color the new color (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's foreground color to the color specified
+ * by the argument, or to the default system color for the control
+ * if the argument is null.
+ *
+ * @param color the new color (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setForeground (Color color) {
 	checkWidget();
@@ -2303,25 +2303,25 @@ void setInitialSize () {
 	OS.gtk_container_resize_children (parentHandle);
 }
 
-/**

- * Sets the receiver's pop up menu to the argument.

- * All controls may optionally have a pop up

- * menu that is displayed when the user requests one for

- * the control. The sequence of key strokes, button presses

- * and/or button releases that are used to request a pop up

- * menu is platform specific.

- *

- * @param menu the new pop up menu

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_MENU_NOT_POP_UP - the menu is not a pop up menu</li>

- *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's pop up menu to the argument.
+ * All controls may optionally have a pop up
+ * menu that is displayed when the user requests one for
+ * the control. The sequence of key strokes, button presses
+ * and/or button releases that are used to request a pop up
+ * menu is platform specific.
+ *
+ * @param menu the new pop up menu
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_MENU_NOT_POP_UP - the menu is not a pop up menu</li>
+ *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setMenu (Menu menu) {
 	checkWidget();
@@ -2336,21 +2336,21 @@ public void setMenu (Menu menu) {
 	this.menu = menu;
 }
 
-/**

- * Changes the parent of the widget to be the one provided if

- * the underlying operating system supports this feature.

- * Answers <code>true</code> if the parent is successfully changed.

- *

- * @param parent the new parent for the control.

- * @return <code>true</code> if the parent is changed and <code>false</code> otherwise.

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 

- * </ul>

- * @exception SWTError <ul>

- *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>

- *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>

- *	</ul>

+/**
+ * Changes the parent of the widget to be the one provided if
+ * the underlying operating system supports this feature.
+ * Answers <code>true</code> if the parent is successfully changed.
+ *
+ * @param parent the new parent for the control.
+ * @return <code>true</code> if the parent is changed and <code>false</code> otherwise.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li> 
+ * </ul>
+ * @exception SWTError <ul>
+ *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
+ *	</ul>
  */
 public boolean setParent (Composite parent) {
 	checkWidget();
@@ -2358,27 +2358,27 @@ public boolean setParent (Composite parent) {
 	return false;
 }
 
-/**

- * If the argument is <code>false</code>, causes subsequent drawing

- * operations in the receiver to be ignored. No drawing of any kind

- * can occur in the receiver until the flag is set to true.

- * Graphics operations that occurred while the flag was

- * <code>false</code> are lost. When the flag is set to <code>true</code>,

- * the entire widget is marked as needing to be redrawn.

- * <p>

- * Note: This operation is a hint and may not be supported on some

- * platforms or for some widgets.

- * </p>

- *

- * @param redraw the new redraw state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @see #redraw

- * @see #update

+/**
+ * If the argument is <code>false</code>, causes subsequent drawing
+ * operations in the receiver to be ignored. No drawing of any kind
+ * can occur in the receiver until the flag is set to true.
+ * Graphics operations that occurred while the flag was
+ * <code>false</code> are lost. When the flag is set to <code>true</code>,
+ * the entire widget is marked as needing to be redrawn.
+ * <p>
+ * Note: This operation is a hint and may not be supported on some
+ * platforms or for some widgets.
+ * </p>
+ *
+ * @param redraw the new redraw state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see #redraw
+ * @see #update
  */
 public void setRedraw (boolean redraw) {
 	checkWidget();
@@ -2392,16 +2392,16 @@ boolean setTabItemFocus () {
 	return setFocus ();
 }
 
-/**

- * Sets the receiver's tool tip text to the argument, which

- * may be null indicating that no tool tip text should be shown.

- *

- * @param string the new tool tip text (or null)

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's tool tip text to the argument, which
+ * may be null indicating that no tool tip text should be shown.
+ *
+ * @param string the new tool tip text (or null)
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setToolTipText (String string) {
 	checkWidget();
@@ -2415,21 +2415,21 @@ public void setToolTipText (String string) {
 	OS.gtk_tooltips_set_tip (tooltipsHandle, handle, buffer, null);
 }
 
-/**

- * Marks the receiver as visible if the argument is <code>true</code>,

- * and marks it invisible otherwise. 

- * <p>

- * If one of the receiver's ancestors is not visible or some

- * other condition makes the receiver not visible, marking

- * it visible may not actually cause it to be displayed.

- * </p>

- *

- * @param visible the new visibility state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Marks the receiver as visible if the argument is <code>true</code>,
+ * and marks it invisible otherwise. 
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, marking
+ * it visible may not actually cause it to be displayed.
+ * </p>
+ *
+ * @param visible the new visibility state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setVisible (boolean visible) {
 	checkWidget();
@@ -2496,20 +2496,20 @@ void sort (int [] items) {
 	}
 }
 
-/**

- * Based on the argument, perform one of the expected platform

- * traversal action. The argument should be one of the constants:

- * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>, 

- * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>, 

- * <code>SWT.TRAVERSE_ARROW_NEXT</code> and <code>SWT.TRAVERSE_ARROW_PREVIOUS</code>.

- *

- * @param traversal the type of traversal

- * @return true if the traversal succeeded

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Based on the argument, perform one of the expected platform
+ * traversal action. The argument should be one of the constants:
+ * <code>SWT.TRAVERSE_ESCAPE</code>, <code>SWT.TRAVERSE_RETURN</code>, 
+ * <code>SWT.TRAVERSE_TAB_NEXT</code>, <code>SWT.TRAVERSE_TAB_PREVIOUS</code>, 
+ * <code>SWT.TRAVERSE_ARROW_NEXT</code> and <code>SWT.TRAVERSE_ARROW_PREVIOUS</code>.
+ *
+ * @param traversal the type of traversal
+ * @return true if the traversal succeeded
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean traverse (int traversal) {
 	checkWidget ();
@@ -2705,16 +2705,16 @@ boolean traverseMnemonic (Event event) {
 	return true;
 }
 
-/**

- * Forces all outstanding paint requests for the widget tree

- * to be processed before this method returns.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #redraw

+/**
+ * Forces all outstanding paint requests for the widget tree
+ * to be processed before this method returns.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #redraw
  */
 public void update () {
 	checkWidget ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
index 57b650e9a6..a6bb057931 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
@@ -1,554 +1,554 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-

-/**

- * Instances of this class provide the appearance and

- * behavior of <code>Shells</code>, but are not top

- * level shells or dialogs. Class <code>Shell</code>

- * shares a significant amount of code with this class,

- * and is a subclass.

- * <p>

- * Instances are always displayed in one of the maximized, 

- * minimized or normal states:

- * <ul>

- * <li>

- * When an instance is marked as <em>maximized</em>, the

- * window manager will typically resize it to fill the

- * entire visible area of the display, and the instance

- * is usually put in a state where it can not be resized 

- * (even if it has style <code>RESIZE</code>) until it is

- * no longer maximized.

- * </li><li>

- * When an instance is in the <em>normal</em> state (neither

- * maximized or minimized), its appearance is controlled by

- * the style constants which were specified when it was created

- * and the restrictions of the window manager (see below).

- * </li><li>

- * When an instance has been marked as <em>minimized</em>,

- * its contents (client area) will usually not be visible,

- * and depending on the window manager, it may be

- * "iconified" (that is, replaced on the desktop by a small

- * simplified representation of itself), relocated to a

- * distinguished area of the screen, or hidden. Combinations

- * of these changes are also possible.

- * </li>

- * </ul>

- * </p>

- * Note: The styles supported by this class must be treated

- * as <em>HINT</em>s, since the window manager for the

- * desktop on which the instance is visible has ultimate

- * control over the appearance and behavior of decorations.

- * For example, some window managers only support resizable

- * windows and will always assume the RESIZE style, even if

- * it is not set.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>BORDER, CLOSE, MIN, MAX, NO_TRIM, RESIZE, TITLE, ON_TOP, TOOL</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * Class <code>SWT</code> provides two "convenience constants"

- * for the most commonly required style combinations:

- * <dl>

- * <dt><code>SHELL_TRIM</code></dt>

- * <dd>

- * the result of combining the constants which are required

- * to produce a typical application top level shell: (that 

- * is, <code>CLOSE | TITLE | MIN | MAX | RESIZE</code>)

- * </dd>

- * <dt><code>DIALOG_TRIM</code></dt>

- * <dd>

- * the result of combining the constants which are required

- * to produce a typical application dialog shell: (that 

- * is, <code>TITLE | CLOSE | BORDER</code>)

- * </dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

- *

- * @see #getMinimized

- * @see #getMaximized

- * @see Shell

- * @see SWT

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class Decorations extends Canvas {

-	String text;

-	Image image;

-	boolean minimized, maximized;

-	Menu menuBar;

-	Menu [] menus;

-	Control savedFocus;

-	Button defaultButton, saveDefault;

-	int accelGroup;	

-	

-Decorations () {

-	/* Do nothing */

-}

-

-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#BORDER

- * @see SWT#CLOSE

- * @see SWT#MIN

- * @see SWT#MAX

- * @see SWT#RESIZE

- * @see SWT#TITLE

- * @see SWT#NO_TRIM

- * @see SWT#SHELL_TRIM

- * @see SWT#DIALOG_TRIM

- * @see SWT#ON_TOP

- * @see SWT#TOOL

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+
+/**
+ * Instances of this class provide the appearance and
+ * behavior of <code>Shells</code>, but are not top
+ * level shells or dialogs. Class <code>Shell</code>
+ * shares a significant amount of code with this class,
+ * and is a subclass.
+ * <p>
+ * Instances are always displayed in one of the maximized, 
+ * minimized or normal states:
+ * <ul>
+ * <li>
+ * When an instance is marked as <em>maximized</em>, the
+ * window manager will typically resize it to fill the
+ * entire visible area of the display, and the instance
+ * is usually put in a state where it can not be resized 
+ * (even if it has style <code>RESIZE</code>) until it is
+ * no longer maximized.
+ * </li><li>
+ * When an instance is in the <em>normal</em> state (neither
+ * maximized or minimized), its appearance is controlled by
+ * the style constants which were specified when it was created
+ * and the restrictions of the window manager (see below).
+ * </li><li>
+ * When an instance has been marked as <em>minimized</em>,
+ * its contents (client area) will usually not be visible,
+ * and depending on the window manager, it may be
+ * "iconified" (that is, replaced on the desktop by a small
+ * simplified representation of itself), relocated to a
+ * distinguished area of the screen, or hidden. Combinations
+ * of these changes are also possible.
+ * </li>
+ * </ul>
+ * </p>
+ * Note: The styles supported by this class must be treated
+ * as <em>HINT</em>s, since the window manager for the
+ * desktop on which the instance is visible has ultimate
+ * control over the appearance and behavior of decorations.
+ * For example, some window managers only support resizable
+ * windows and will always assume the RESIZE style, even if
+ * it is not set.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>BORDER, CLOSE, MIN, MAX, NO_TRIM, RESIZE, TITLE, ON_TOP, TOOL</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * Class <code>SWT</code> provides two "convenience constants"
+ * for the most commonly required style combinations:
+ * <dl>
+ * <dt><code>SHELL_TRIM</code></dt>
+ * <dd>
+ * the result of combining the constants which are required
+ * to produce a typical application top level shell: (that 
+ * is, <code>CLOSE | TITLE | MIN | MAX | RESIZE</code>)
+ * </dd>
+ * <dt><code>DIALOG_TRIM</code></dt>
+ * <dd>
+ * the result of combining the constants which are required
+ * to produce a typical application dialog shell: (that 
+ * is, <code>TITLE | CLOSE | BORDER</code>)
+ * </dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
+ *
+ * @see #getMinimized
+ * @see #getMaximized
+ * @see Shell
+ * @see SWT
  */
-public Decorations (Composite parent, int style) {

-	super (parent, checkStyle (style));

-}

-

-static int checkStyle (int style) {

-	if ((style & (SWT.MENU | SWT.MIN | SWT.MAX | SWT.CLOSE)) != 0) {

-		style |= SWT.TITLE;

-	}

-	return style;

-}

-

-void add (Menu menu) {

-	if (menus == null) menus = new Menu [4];

-	for (int i=0; i<menus.length; i++) {

-		if (menus [i] == null) {

-			menus [i] = menu;

-			return;

-		}

-	}

-	Menu [] newMenus = new Menu [menus.length + 4];

-	newMenus [menus.length] = menu;

-	System.arraycopy (menus, 0, newMenus, 0, menus.length);

-	menus = newMenus;

-}

-

-Control computeTabGroup () {

-	return this;

-}

-

-Control computeTabRoot () {

-	return this;

-}

-

-void createAccelGroup () {

-	if (accelGroup != 0) return;

-	accelGroup = OS.gtk_accel_group_new ();

-	if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);

-	//FIXME - what should we do for Decorations

-	int shellHandle = topHandle ();

-	OS.gtk_window_add_accel_group (shellHandle, accelGroup);

-}

-

-void createWidget (int index) {

-	super.createWidget (index);

-	text = "";

-}

-

-void destroyAccelGroup () {

-	if (accelGroup == 0) return;

-	int shellHandle = topHandle ();

-	OS.gtk_window_remove_accel_group (shellHandle, accelGroup);

-	//TEMPORARY CODE

-//	OS.g_object_unref (accelGroup);

-	accelGroup = 0;

-}

-

-/**

- * Returns the receiver's default button if one had

- * previously been set, otherwise returns null.

- *

- * @return the default button or null

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setDefaultButton

+public class Decorations extends Canvas {
+	String text;
+	Image image;
+	boolean minimized, maximized;
+	Menu menuBar;
+	Menu [] menus;
+	Control savedFocus;
+	Button defaultButton, saveDefault;
+	int accelGroup;	
+	
+Decorations () {
+	/* Do nothing */
+}
+
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#BORDER
+ * @see SWT#CLOSE
+ * @see SWT#MIN
+ * @see SWT#MAX
+ * @see SWT#RESIZE
+ * @see SWT#TITLE
+ * @see SWT#NO_TRIM
+ * @see SWT#SHELL_TRIM
+ * @see SWT#DIALOG_TRIM
+ * @see SWT#ON_TOP
+ * @see SWT#TOOL
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
-public Button getDefaultButton () {

-	checkWidget();

-	return defaultButton != null ? defaultButton : saveDefault;

-}

-

-/**

- * Returns the receiver's image if it had previously been 

- * set using <code>setImage()</code>. The image is typically

- * displayed by the window manager when the instance is

- * marked as iconified, and may also be displayed somewhere

- * in the trim when the instance is in normal or maximized

- * states.

- * <p>

- * Note: This method will return null if called before

- * <code>setImage()</code> is called. It does not provide

- * access to a window manager provided, "default" image

- * even if one exists.

- * </p>

- * 

- * @return the image

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public Decorations (Composite parent, int style) {
+	super (parent, checkStyle (style));
+}
+
+static int checkStyle (int style) {
+	if ((style & (SWT.MENU | SWT.MIN | SWT.MAX | SWT.CLOSE)) != 0) {
+		style |= SWT.TITLE;
+	}
+	return style;
+}
+
+void add (Menu menu) {
+	if (menus == null) menus = new Menu [4];
+	for (int i=0; i<menus.length; i++) {
+		if (menus [i] == null) {
+			menus [i] = menu;
+			return;
+		}
+	}
+	Menu [] newMenus = new Menu [menus.length + 4];
+	newMenus [menus.length] = menu;
+	System.arraycopy (menus, 0, newMenus, 0, menus.length);
+	menus = newMenus;
+}
+
+Control computeTabGroup () {
+	return this;
+}
+
+Control computeTabRoot () {
+	return this;
+}
+
+void createAccelGroup () {
+	if (accelGroup != 0) return;
+	accelGroup = OS.gtk_accel_group_new ();
+	if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);
+	//FIXME - what should we do for Decorations
+	int shellHandle = topHandle ();
+	OS.gtk_window_add_accel_group (shellHandle, accelGroup);
+}
+
+void createWidget (int index) {
+	super.createWidget (index);
+	text = "";
+}
+
+void destroyAccelGroup () {
+	if (accelGroup == 0) return;
+	int shellHandle = topHandle ();
+	OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
+	//TEMPORARY CODE
+//	OS.g_object_unref (accelGroup);
+	accelGroup = 0;
+}
+
+/**
+ * Returns the receiver's default button if one had
+ * previously been set, otherwise returns null.
+ *
+ * @return the default button or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setDefaultButton
  */
-public Image getImage () {

-	checkWidget();

-	return image;

-}

-

-/**

- * Returns <code>true</code> if the receiver is currently

- * maximized, and false otherwise. 

- * <p>

- *

- * @return the maximized state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setMaximized

+public Button getDefaultButton () {
+	checkWidget();
+	return defaultButton != null ? defaultButton : saveDefault;
+}
+
+/**
+ * Returns the receiver's image if it had previously been 
+ * set using <code>setImage()</code>. The image is typically
+ * displayed by the window manager when the instance is
+ * marked as iconified, and may also be displayed somewhere
+ * in the trim when the instance is in normal or maximized
+ * states.
+ * <p>
+ * Note: This method will return null if called before
+ * <code>setImage()</code> is called. It does not provide
+ * access to a window manager provided, "default" image
+ * even if one exists.
+ * </p>
+ * 
+ * @return the image
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public boolean getMaximized () {

-	checkWidget();

-	return maximized;

-}

-

-/**

- * Returns the receiver's menu bar if one had previously

- * been set, otherwise returns null.

- *

- * @return the menu bar or null

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public Image getImage () {
+	checkWidget();
+	return image;
+}
+
+/**
+ * Returns <code>true</code> if the receiver is currently
+ * maximized, and false otherwise. 
+ * <p>
+ *
+ * @return the maximized state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setMaximized
  */
-public Menu getMenuBar () {

-	checkWidget();

-	return menuBar;

-}

-

-/**

- * Returns <code>true</code> if the receiver is currently

- * minimized, and false otherwise. 

- * <p>

- *

- * @return the minimized state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setMinimized

+public boolean getMaximized () {
+	checkWidget();
+	return maximized;
+}
+
+/**
+ * Returns the receiver's menu bar if one had previously
+ * been set, otherwise returns null.
+ *
+ * @return the menu bar or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public boolean getMinimized () {

-	checkWidget();

-	return minimized;

-}

-

-String getNameText () {

-	return getText ();

-}

-

-/**

- * Returns the receiver's text, which is the string that the

- * window manager will typically display as the receiver's

- * <em>title</em>. If the text has not previously been set, 

- * returns an empty string.

- *

- * @return the text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public Menu getMenuBar () {
+	checkWidget();
+	return menuBar;
+}
+
+/**
+ * Returns <code>true</code> if the receiver is currently
+ * minimized, and false otherwise. 
+ * <p>
+ *
+ * @return the minimized state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setMinimized
  */
-public String getText () {

-	checkWidget();

-	return text;

-}

-

-boolean isTabGroup () {

-	return true;

-}

-

-boolean isTabItem () {

-	return false;

-}

-

-Decorations menuShell () {

-	return this;

-}

-

-void remove (Menu menu) {

-	if (menus == null) return;

-	for (int i=0; i<menus.length; i++) {

-		if (menus [i] == menu) {

-			menus [i] = null;

-			return;

-		}

-	}

-}

-

-void releaseWidget () {

-	if (menuBar != null) menuBar.releaseResources ();

-	menuBar = null;

-	if (menus != null) {

-		for (int i=0; i<menus.length; i++) {

-			Menu menu = menus [i];

-			if (menu != null && !menu.isDisposed ()) {

-				menu.dispose ();

-			}

-		}

-	}

-	menus = null;

-	super.releaseWidget ();

-	image = null;

-}

-

-boolean restoreFocus () {

-	if (savedFocus != null && savedFocus.isDisposed ()) savedFocus = null;

-	boolean restored = savedFocus != null && savedFocus.setFocus ();

-	savedFocus = null;

-	/*

-	* This code is intentionally commented.  When no widget

-	* has been given focus, some platforms give focus to the

-	* default button.  Motif doesn't do this.

-	*/

-//	if (restored) return true;

-//	if (defaultButton != null && !defaultButton.isDisposed ()) {

-//		if (defaultButton.setFocus ()) return true;

-//	}

-//	return false;

-	return restored;

-}

-

-/**

- * If the argument is not null, sets the receiver's default

- * button to the argument, and if the argument is null, sets

- * the receiver's default button to the first button which

- * was set as the receiver's default button (called the 

- * <em>saved default button</em>). If no default button had

- * previously been set, or the saved default button was

- * disposed, the receiver's default button will be set to

- * null. 

- *

- * @param the new default button

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the button has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public boolean getMinimized () {
+	checkWidget();
+	return minimized;
+}
+
+String getNameText () {
+	return getText ();
+}
+
+/**
+ * Returns the receiver's text, which is the string that the
+ * window manager will typically display as the receiver's
+ * <em>title</em>. If the text has not previously been set, 
+ * returns an empty string.
+ *
+ * @return the text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setDefaultButton (Button button) {

-	checkWidget();

-	int buttonHandle = 0;

-	if (button != null) {

-		if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);

-		buttonHandle = button.handle;

-	}

-	saveDefault = defaultButton = button;

-	OS.gtk_window_set_default (topHandle (), buttonHandle);

-}

-

-/**

- * Sets the receiver's image to the argument, which may

- * be null. The image is typically displayed by the window

- * manager when the instance is marked as iconified, and

- * may also be displayed somewhere in the trim when the

- * instance is in normal or maximized states.

- * 

- * @param image the new image (or null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public String getText () {
+	checkWidget();
+	return text;
+}
+
+boolean isTabGroup () {
+	return true;
+}
+
+boolean isTabItem () {
+	return false;
+}
+
+Decorations menuShell () {
+	return this;
+}
+
+void remove (Menu menu) {
+	if (menus == null) return;
+	for (int i=0; i<menus.length; i++) {
+		if (menus [i] == menu) {
+			menus [i] = null;
+			return;
+		}
+	}
+}
+
+void releaseWidget () {
+	if (menuBar != null) menuBar.releaseResources ();
+	menuBar = null;
+	if (menus != null) {
+		for (int i=0; i<menus.length; i++) {
+			Menu menu = menus [i];
+			if (menu != null && !menu.isDisposed ()) {
+				menu.dispose ();
+			}
+		}
+	}
+	menus = null;
+	super.releaseWidget ();
+	image = null;
+}
+
+boolean restoreFocus () {
+	if (savedFocus != null && savedFocus.isDisposed ()) savedFocus = null;
+	boolean restored = savedFocus != null && savedFocus.setFocus ();
+	savedFocus = null;
+	/*
+	* This code is intentionally commented.  When no widget
+	* has been given focus, some platforms give focus to the
+	* default button.  Motif doesn't do this.
+	*/
+//	if (restored) return true;
+//	if (defaultButton != null && !defaultButton.isDisposed ()) {
+//		if (defaultButton.setFocus ()) return true;
+//	}
+//	return false;
+	return restored;
+}
+
+/**
+ * If the argument is not null, sets the receiver's default
+ * button to the argument, and if the argument is null, sets
+ * the receiver's default button to the first button which
+ * was set as the receiver's default button (called the 
+ * <em>saved default button</em>). If no default button had
+ * previously been set, or the saved default button was
+ * disposed, the receiver's default button will be set to
+ * null. 
+ *
+ * @param the new default button
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the button has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setImage (Image image) {

-	checkWidget();

-	this.image = image;

-	int pixmap = 0, mask = 0;

-	if (image != null) {

-		pixmap = image.pixmap;

-		mask = image.mask;

-	}

-	int window = OS.GTK_WIDGET_WINDOW(topHandle());

-	OS.gdk_window_set_icon (window, 0, pixmap, mask);

-}

-

-/**

- * Sets the maximized state of the receiver.

- * If the argument is <code>true</code> causes the receiver

- * to switch to the maximized state, and if the argument is

- * <code>false</code> and the receiver was previously maximized,

- * causes the receiver to switch back to either the minimized

- * or normal states.

- * <p>

- * Note: The result of intermixing calls to<code>setMaximized(true)</code>

- * and <code>setMinimized(true)</code> will vary by platform. Typically,

- * the behavior will match the platform user's expectations, but not

- * always. This should be avoided if possible.

- * </p>

- *

- * @param the new maximized state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setMinimized

+public void setDefaultButton (Button button) {
+	checkWidget();
+	int buttonHandle = 0;
+	if (button != null) {
+		if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+		buttonHandle = button.handle;
+	}
+	saveDefault = defaultButton = button;
+	OS.gtk_window_set_default (topHandle (), buttonHandle);
+}
+
+/**
+ * Sets the receiver's image to the argument, which may
+ * be null. The image is typically displayed by the window
+ * manager when the instance is marked as iconified, and
+ * may also be displayed somewhere in the trim when the
+ * instance is in normal or maximized states.
+ * 
+ * @param image the new image (or null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setMaximized (boolean maximized) {

-	checkWidget();

-	this.maximized = maximized;

-}

-

-/**

- * Sets the receiver's menu bar to the argument, which

- * may be null.

- *

- * @param menu the new menu bar

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li> 

- *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public void setImage (Image image) {
+	checkWidget();
+	this.image = image;
+	int pixmap = 0, mask = 0;
+	if (image != null) {
+		pixmap = image.pixmap;
+		mask = image.mask;
+	}
+	int window = OS.GTK_WIDGET_WINDOW(topHandle());
+	OS.gdk_window_set_icon (window, 0, pixmap, mask);
+}
+
+/**
+ * Sets the maximized state of the receiver.
+ * If the argument is <code>true</code> causes the receiver
+ * to switch to the maximized state, and if the argument is
+ * <code>false</code> and the receiver was previously maximized,
+ * causes the receiver to switch back to either the minimized
+ * or normal states.
+ * <p>
+ * Note: The result of intermixing calls to<code>setMaximized(true)</code>
+ * and <code>setMinimized(true)</code> will vary by platform. Typically,
+ * the behavior will match the platform user's expectations, but not
+ * always. This should be avoided if possible.
+ * </p>
+ *
+ * @param the new maximized state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setMinimized
  */
-public void setMenuBar (Menu menu) {

-	checkWidget();

-	if (menuBar == menu) return;

-	if (menu != null) {

-		if ((menu.style & SWT.BAR) == 0) error (SWT.ERROR_MENU_NOT_BAR);

-		if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);

-	}

-	menuBar = menu;

-}

-

-/**

- * Sets the minimized stated of the receiver.

- * If the argument is <code>true</code> causes the receiver

- * to switch to the minimized state, and if the argument is

- * <code>false</code> and the receiver was previously minimized,

- * causes the receiver to switch back to either the maximized

- * or normal states.

- * <p>

- * Note: The result of intermixing calls to<code>setMaximized(true)</code>

- * and <code>setMinimized(true)</code> will vary by platform. Typically,

- * the behavior will match the platform user's expectations, but not

- * always. This should be avoided if possible.

- * </p>

- *

- * @param the new maximized state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setMaximized

+public void setMaximized (boolean maximized) {
+	checkWidget();
+	this.maximized = maximized;
+}
+
+/**
+ * Sets the receiver's menu bar to the argument, which
+ * may be null.
+ *
+ * @param menu the new menu bar
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li> 
+ *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setMinimized (boolean minimized) {

-	checkWidget();

-	this.minimized = minimized;

-}

-

-void setSavedFocus (Control control) {

-	if (this == control) return;

-	savedFocus = control;

-}

-

-/**

- * Sets the receiver's text, which is the string that the

- * window manager will typically display as the receiver's

- * <em>title</em>, to the argument, which may not be null. 

- *

- * @param text the new text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public void setMenuBar (Menu menu) {
+	checkWidget();
+	if (menuBar == menu) return;
+	if (menu != null) {
+		if ((menu.style & SWT.BAR) == 0) error (SWT.ERROR_MENU_NOT_BAR);
+		if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);
+	}
+	menuBar = menu;
+}
+
+/**
+ * Sets the minimized stated of the receiver.
+ * If the argument is <code>true</code> causes the receiver
+ * to switch to the minimized state, and if the argument is
+ * <code>false</code> and the receiver was previously minimized,
+ * causes the receiver to switch back to either the maximized
+ * or normal states.
+ * <p>
+ * Note: The result of intermixing calls to<code>setMaximized(true)</code>
+ * and <code>setMinimized(true)</code> will vary by platform. Typically,
+ * the behavior will match the platform user's expectations, but not
+ * always. This should be avoided if possible.
+ * </p>
+ *
+ * @param the new maximized state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setMaximized
  */
-public void setText (String string) {

-	checkWidget();

-	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

-	text = string;

-}

-

-boolean traverseItem (boolean next) {

-	return false;

-}

-

-boolean traverseReturn () {

-	Button button = defaultButton != null ? defaultButton: saveDefault;

-	if (button == null || button.isDisposed ()) return false;

-	/*

-	* Bug in GTK.  When a default button that is disabled is

-	* activated using the Enter key, GTK GP's.  The fix is to

-	* detect this case and stop GTK from processing the Enter

-	* key.

-	*/

-	if (!button.isVisible () || !button.isEnabled ()) return true;

-	int shellHandle = _getShell ().topHandle ();

-	return OS.gtk_window_activate_default (shellHandle);

-}

-

-}

+public void setMinimized (boolean minimized) {
+	checkWidget();
+	this.minimized = minimized;
+}
+
+void setSavedFocus (Control control) {
+	if (this == control) return;
+	savedFocus = control;
+}
+
+/**
+ * Sets the receiver's text, which is the string that the
+ * window manager will typically display as the receiver's
+ * <em>title</em>, to the argument, which may not be null. 
+ *
+ * @param text the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setText (String string) {
+	checkWidget();
+	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
+	text = string;
+}
+
+boolean traverseItem (boolean next) {
+	return false;
+}
+
+boolean traverseReturn () {
+	Button button = defaultButton != null ? defaultButton: saveDefault;
+	if (button == null || button.isDisposed ()) return false;
+	/*
+	* Bug in GTK.  When a default button that is disabled is
+	* activated using the Enter key, GTK GP's.  The fix is to
+	* detect this case and stop GTK from processing the Enter
+	* key.
+	*/
+	if (!button.isVisible () || !button.isEnabled ()) return true;
+	int shellHandle = _getShell ().topHandle ();
+	return OS.gtk_window_activate_default (shellHandle);
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
index 23ae7714ec..d9dd4ac4d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -1,186 +1,186 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-

-/**

- * Instances of this class allow the user to navigate

- * the file system and select a directory.

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class DirectoryDialog extends Dialog {

-	String message = "", filterPath = "";

-

-/**

- * Constructs a new instance of this class given only its

- * parent.

- * <p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+
+/**
+ * Instances of this class allow the user to navigate
+ * the file system and select a directory.
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
-public DirectoryDialog (Shell parent) {

-	this (parent, SWT.PRIMARY_MODAL);

-}

-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+public class DirectoryDialog extends Dialog {
+	String message = "", filterPath = "";
+
+/**
+ * Constructs a new instance of this class given only its
+ * parent.
+ * <p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public DirectoryDialog (Shell parent, int style) {

-	super (parent, style);

-	checkSubclass ();

-}

-/**

- * Returns the path which the dialog will use to filter

- * the directories it shows.

- *

- * @return the filter path

+public DirectoryDialog (Shell parent) {
+	this (parent, SWT.PRIMARY_MODAL);
+}
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public String getFilterPath () {

-	return filterPath;

-}

-/**

- * Returns the dialog's message, which is a description of

- * the purpose for which it was opened. This message will be

- * visible on the dialog while it is open.

- *

- * @return the message

+public DirectoryDialog (Shell parent, int style) {
+	super (parent, style);
+	checkSubclass ();
+}
+/**
+ * Returns the path which the dialog will use to filter
+ * the directories it shows.
+ *
+ * @return the filter path
  */
-public String getMessage () {

-	return message;

-}

-/**

- * Makes the dialog visible and brings it to the front

- * of the display.

- *

- * @return a string describing the absolute path of the selected directory,

- *         or null if the dialog was cancelled or an error occurred

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>

- * </ul>

+public String getFilterPath () {
+	return filterPath;
+}
+/**
+ * Returns the dialog's message, which is a description of
+ * the purpose for which it was opened. This message will be
+ * visible on the dialog while it is open.
+ *
+ * @return the message
  */
-public String open () {

-	byte [] titleBytes = Converter.wcsToMbcs (null, title, true);

-	int handle = OS.gtk_file_selection_new (titleBytes);

-	if (parent != null) {

-		OS.gtk_window_set_transient_for (handle, parent.topHandle ());

-	}

-	String answer = null;

-	if (filterPath != null) {

-		int length = filterPath.length ();

-		char [] buffer = new char [length + 1];

-		filterPath.getChars (0, length, buffer, 0);

-		int utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

-		int fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

-		OS.gtk_file_selection_set_filename (handle, fileNamePtr);

-		OS.g_free (utf8Ptr);

-		OS.g_free (fileNamePtr);		

-	}

-	GtkFileSelection selection = new GtkFileSelection ();

-	OS.memmove (selection, handle);

-	OS.gtk_file_selection_hide_fileop_buttons (handle);

-	int fileListParent = OS.gtk_widget_get_parent (selection.file_list);

-	OS.gtk_widget_hide (selection.file_list);

-	OS.gtk_widget_hide (fileListParent);

-	int response = OS.gtk_dialog_run (handle);

-	if (response == OS.GTK_RESPONSE_OK) {

-		int fileNamePtr = OS.gtk_file_selection_get_filename (handle);

-		int utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

-		int [] items_written = new int [1];

-		int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

-		int length = items_written [0];

-		char [] buffer = new char [length];

-		OS.memmove (buffer, utf16Ptr, length * 2);

-		String osAnswer = new String (buffer);

-		OS.g_free (utf16Ptr);

-		OS.g_free (utf8Ptr);

-		if (osAnswer != null) {

-			answer = osAnswer;

-			// add trailing separator if not already present

-			char separator = System.getProperty ("file.separator").charAt (0);

-			int separatorIndex = answer.lastIndexOf (separator);

-			if (separatorIndex != answer.length () - 1) answer += separator;

-		}

-	}

-	OS.gtk_widget_destroy (handle);

-	return answer;

-}

-/**

- * Sets the path which the dialog will use to filter

- * the directories it shows to the argument, which may be

- * null.

- *

- * @param string the filter path

+public String getMessage () {
+	return message;
+}
+/**
+ * Makes the dialog visible and brings it to the front
+ * of the display.
+ *
+ * @return a string describing the absolute path of the selected directory,
+ *         or null if the dialog was cancelled or an error occurred
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>
+ * </ul>
  */
-public void setFilterPath (String string) {

-	filterPath = string;

-}

-/**

- * Sets the dialog's message, which is a description of

- * the purpose for which it was opened. This message will be

- * visible on the dialog while it is open.

- *

- * @param string the message

+public String open () {
+	byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
+	int handle = OS.gtk_file_selection_new (titleBytes);
+	if (parent != null) {
+		OS.gtk_window_set_transient_for (handle, parent.topHandle ());
+	}
+	String answer = null;
+	if (filterPath != null) {
+		int length = filterPath.length ();
+		char [] buffer = new char [length + 1];
+		filterPath.getChars (0, length, buffer, 0);
+		int utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);
+		int fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);
+		OS.gtk_file_selection_set_filename (handle, fileNamePtr);
+		OS.g_free (utf8Ptr);
+		OS.g_free (fileNamePtr);		
+	}
+	GtkFileSelection selection = new GtkFileSelection ();
+	OS.memmove (selection, handle);
+	OS.gtk_file_selection_hide_fileop_buttons (handle);
+	int fileListParent = OS.gtk_widget_get_parent (selection.file_list);
+	OS.gtk_widget_hide (selection.file_list);
+	OS.gtk_widget_hide (fileListParent);
+	int response = OS.gtk_dialog_run (handle);
+	if (response == OS.GTK_RESPONSE_OK) {
+		int fileNamePtr = OS.gtk_file_selection_get_filename (handle);
+		int utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);
+		int [] items_written = new int [1];
+		int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+		int length = items_written [0];
+		char [] buffer = new char [length];
+		OS.memmove (buffer, utf16Ptr, length * 2);
+		String osAnswer = new String (buffer);
+		OS.g_free (utf16Ptr);
+		OS.g_free (utf8Ptr);
+		if (osAnswer != null) {
+			answer = osAnswer;
+			// add trailing separator if not already present
+			char separator = System.getProperty ("file.separator").charAt (0);
+			int separatorIndex = answer.lastIndexOf (separator);
+			if (separatorIndex != answer.length () - 1) answer += separator;
+		}
+	}
+	OS.gtk_widget_destroy (handle);
+	return answer;
+}
+/**
+ * Sets the path which the dialog will use to filter
+ * the directories it shows to the argument, which may be
+ * null.
+ *
+ * @param string the filter path
  */
-public void setMessage (String string) {

-	/*

-	 * The native Gtk file selection dialog does not support message

-	 * strings other than the dialog title.  However, we maintain the set

-	 * message so at least the application programs get back the same string.

-	 */

-	message = string;

-}

-}

+public void setFilterPath (String string) {
+	filterPath = string;
+}
+/**
+ * Sets the dialog's message, which is a description of
+ * the purpose for which it was opened. This message will be
+ * visible on the dialog while it is open.
+ *
+ * @param string the message
+ */
+public void setMessage (String string) {
+	/*
+	 * The native Gtk file selection dialog does not support message
+	 * strings other than the dialog title.  However, we maintain the set
+	 * message so at least the application programs get back the same string.
+	 */
+	message = string;
+}
+}
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 51b3d8b44c..7f883f95f8 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
@@ -12,80 +12,80 @@ import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
-/**

- * Instances of this class are responsible for managing the

- * connection between SWT and the underlying operating

- * system. Their most important function is to implement

- * the SWT event loop in terms of the platform event model.

- * They also provide various methods for accessing information

- * about the operating system, and have overall control over

- * the operating system resources which SWT allocates.

- * <p>

- * Applications which are built with SWT will <em>almost always</em>

- * require only a single display. In particular, some platforms

- * which SWT supports will not allow more than one <em>active</em>

- * display. In other words, some platforms do not support

- * creating a new display if one already exists that has not been

- * sent the <code>dispose()</code> message.

- * <p>

- * In SWT, the thread which creates a <code>Display</code>

- * instance is distinguished as the <em>user-interface thread</em>

- * for that display.

- * </p>

- * The user-interface thread for a particular display has the

- * following special attributes:

- * <ul>

- * <li>

- * The event loop for that display must be run from the thread.

- * </li>

- * <li>

- * Some SWT API methods (notably, most of the public methods in

- * <code>Widget</code> and its subclasses), may only be called

- * from the thread. (To support multi-threaded user-interface

- * applications, class <code>Display</code> provides inter-thread

- * communication methods which allow threads other than the 

- * user-interface thread to request that it perform operations

- * on their behalf.)

- * </li>

- * <li>

- * The thread is not allowed to construct other 

- * <code>Display</code>s until that display has been disposed.

- * (Note that, this is in addition to the restriction mentioned

- * above concerning platform support for multiple displays. Thus,

- * the only way to have multiple simultaneously active displays,

- * even on platforms which support it, is to have multiple threads.)

- * </li>

- * </ul>

- * Enforcing these attributes allows SWT to be implemented directly

- * on the underlying operating system's event model. This has 

- * numerous benefits including smaller footprint, better use of 

- * resources, safer memory management, clearer program logic,

- * better performance, and fewer overall operating system threads

- * required. The down side however, is that care must be taken

- * (only) when constructing multi-threaded applications to use the

- * inter-thread communication mechanisms which this class provides

- * when required.

- * </p><p>

- * All SWT API methods which may only be called from the user-interface

- * thread are distinguished in their documentation by indicating that

- * they throw the "<code>ERROR_THREAD_INVALID_ACCESS</code>"

- * SWT exception.

- * </p>

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>Close, Dispose</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

- * @see #syncExec

- * @see #asyncExec

- * @see #wake

- * @see #readAndDispatch

- * @see #sleep

- * @see #dispose

+/**
+ * Instances of this class are responsible for managing the
+ * connection between SWT and the underlying operating
+ * system. Their most important function is to implement
+ * the SWT event loop in terms of the platform event model.
+ * They also provide various methods for accessing information
+ * about the operating system, and have overall control over
+ * the operating system resources which SWT allocates.
+ * <p>
+ * Applications which are built with SWT will <em>almost always</em>
+ * require only a single display. In particular, some platforms
+ * which SWT supports will not allow more than one <em>active</em>
+ * display. In other words, some platforms do not support
+ * creating a new display if one already exists that has not been
+ * sent the <code>dispose()</code> message.
+ * <p>
+ * In SWT, the thread which creates a <code>Display</code>
+ * instance is distinguished as the <em>user-interface thread</em>
+ * for that display.
+ * </p>
+ * The user-interface thread for a particular display has the
+ * following special attributes:
+ * <ul>
+ * <li>
+ * The event loop for that display must be run from the thread.
+ * </li>
+ * <li>
+ * Some SWT API methods (notably, most of the public methods in
+ * <code>Widget</code> and its subclasses), may only be called
+ * from the thread. (To support multi-threaded user-interface
+ * applications, class <code>Display</code> provides inter-thread
+ * communication methods which allow threads other than the 
+ * user-interface thread to request that it perform operations
+ * on their behalf.)
+ * </li>
+ * <li>
+ * The thread is not allowed to construct other 
+ * <code>Display</code>s until that display has been disposed.
+ * (Note that, this is in addition to the restriction mentioned
+ * above concerning platform support for multiple displays. Thus,
+ * the only way to have multiple simultaneously active displays,
+ * even on platforms which support it, is to have multiple threads.)
+ * </li>
+ * </ul>
+ * Enforcing these attributes allows SWT to be implemented directly
+ * on the underlying operating system's event model. This has 
+ * numerous benefits including smaller footprint, better use of 
+ * resources, safer memory management, clearer program logic,
+ * better performance, and fewer overall operating system threads
+ * required. The down side however, is that care must be taken
+ * (only) when constructing multi-threaded applications to use the
+ * inter-thread communication mechanisms which this class provides
+ * when required.
+ * </p><p>
+ * All SWT API methods which may only be called from the user-interface
+ * thread are distinguished in their documentation by indicating that
+ * they throw the "<code>ERROR_THREAD_INVALID_ACCESS</code>"
+ * SWT exception.
+ * </p>
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Close, Dispose</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
+ * @see #syncExec
+ * @see #asyncExec
+ * @see #wake
+ * @see #readAndDispatch
+ * @see #sleep
+ * @see #dispose
  */
 public class Display extends Device {
 
@@ -272,24 +272,24 @@ static void setDevice (Device device) {
 	CurrentDevice = device;
 }
 
-/**

- * Constructs a new instance of this class.

- * <p>

- * Note: The resulting display is marked as the <em>current</em>

- * display. If this is the first display which has been 

- * constructed since the application started, it is also

- * marked as the <em>default</em> display.

- * </p>

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see #getCurrent

- * @see #getDefault

- * @see Widget#checkSubclass

- * @see Shell

+/**
+ * Constructs a new instance of this class.
+ * <p>
+ * Note: The resulting display is marked as the <em>current</em>
+ * display. If this is the first display which has been 
+ * constructed since the application started, it is also
+ * marked as the <em>default</em> display.
+ * </p>
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see #getCurrent
+ * @see #getDefault
+ * @see Widget#checkSubclass
+ * @see Shell
  */
 public Display () {
 	this (null);
@@ -328,26 +328,26 @@ void addFilter (int eventType, Listener listener) {
 	filterTable.hook (eventType, listener);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notifed when an event of the given type occurs. When the

- * event does occur in the display, the listener is notified by

- * sending it the <code>handleEvent()</code> message.

- *

- * @param eventType the type of event to listen for

- * @param listener the listener which should be notified when the event occurs

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see Listener

- * @see #removeListener

- * 

- * @since 2.0 

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notifed when an event of the given type occurs. When the
+ * event does occur in the display, the listener is notified by
+ * sending it the <code>handleEvent()</code> message.
+ *
+ * @param eventType the type of event to listen for
+ * @param listener the listener which should be notified when the event occurs
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see Listener
+ * @see #removeListener
+ * 
+ * @since 2.0 
  */
 public void addListener (int eventType, Listener listener) {
 	checkDevice ();
@@ -362,25 +362,25 @@ void addMouseHoverTimeout (int handle) {
 	mouseHoverHandle = handle;
 }
 
-/**

- * Causes the <code>run()</code> method of the runnable to

- * be invoked by the user-interface thread at the next 

- * reasonable opportunity. The caller of this method continues 

- * to run in parallel, and is not notified when the

- * runnable has completed.

- *

- * @param runnable code to run on the user-interface thread.

- *

- * @see #syncExec

+/**
+ * Causes the <code>run()</code> method of the runnable to
+ * be invoked by the user-interface thread at the next 
+ * reasonable opportunity. The caller of this method continues 
+ * to run in parallel, and is not notified when the
+ * runnable has completed.
+ *
+ * @param runnable code to run on the user-interface thread.
+ *
+ * @see #syncExec
  */
 public void asyncExec (Runnable runnable) {
 	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
 	synchronizer.asyncExec (runnable);
 }
 
-/**

- * Causes the system hardware to emit a short sound

- * (if it supports this capability).

+/**
+ * Causes the system hardware to emit a short sound
+ * (if it supports this capability).
  */
 public void beep () {
 	if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
@@ -405,17 +405,17 @@ protected void checkSubclass () {
 	if (!isValidClass (getClass ())) error (SWT.ERROR_INVALID_SUBCLASS);
 }
 
-/**

- * Requests that the connection between SWT and the underlying

- * operating system be closed.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #dispose

- * 

- * @since 2.0

+/**
+ * Requests that the connection between SWT and the underlying
+ * operating system be closed.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #dispose
+ * 
+ * @since 2.0
  */
 public void close () {
 	checkDevice ();
@@ -480,13 +480,13 @@ protected void destroy () {
 void destroyDisplay () {
 }
 
-/**

- * Returns the display which the given thread is the

- * user-interface thread for, or null if the given thread

- * is not a user-interface thread for any display.

- *

- * @param thread the user-interface thread

- * @return the display for the given thread

+/**
+ * Returns the display which the given thread is the
+ * user-interface thread for, or null if the given thread
+ * is not a user-interface thread for any display.
+ *
+ * @param thread the user-interface thread
+ * @return the display for the given thread
  */
 public static synchronized Display findDisplay (Thread thread) {
 	for (int i=0; i<Displays.length; i++) {
@@ -498,12 +498,12 @@ public static synchronized Display findDisplay (Thread thread) {
 	return null;
 }
 
-/**

- * Causes the <code>run()</code> method of the runnable to

- * be invoked by the user-interface thread just before the

- * receiver is disposed.

- *

- * @param runnable code to run at dispose time.

+/**
+ * Causes the <code>run()</code> method of the runnable to
+ * be invoked by the user-interface thread just before the
+ * receiver is disposed.
+ *
+ * @param runnable code to run at dispose time.
  */
 public void disposeExec (Runnable runnable) {
 	checkDevice ();
@@ -577,34 +577,34 @@ int eventProc (int event, int data) {
 	return 0;
 }
 
-/**

- * Given the operating system handle for a widget, returns

- * the instance of the <code>Widget</code> subclass which

- * represents it in the currently running application, if

- * such exists, or null if no matching widget can be found.

- *

- * @param handle the handle for the widget

- * @return the SWT widget that the handle represents

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Given the operating system handle for a widget, returns
+ * the instance of the <code>Widget</code> subclass which
+ * represents it in the currently running application, if
+ * such exists, or null if no matching widget can be found.
+ *
+ * @param handle the handle for the widget
+ * @return the SWT widget that the handle represents
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Widget findWidget (int handle) {
 	checkDevice ();
 	return WidgetTable.get (handle);
 }
  
-/**

- * Returns the currently active <code>Shell</code>, or null

- * if no shell belonging to the currently running application

- * is active.

- *

- * @return the active shell or null

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the currently active <code>Shell</code>, or null
+ * if no shell belonging to the currently running application
+ * is active.
+ *
+ * @return the active shell or null
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Shell getActiveShell () {
 	checkDevice ();
@@ -615,26 +615,26 @@ public Shell getActiveShell () {
 	return null;
 }
 
-/**

- * Returns a rectangle describing the receiver's size and location.

- *

- * @return the bounding rectangle

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a rectangle describing the receiver's size and location.
+ *
+ * @return the bounding rectangle
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Rectangle getBounds () {
 	checkDevice ();
 	return new Rectangle (0, 0, OS.gdk_screen_width (), OS.gdk_screen_height ());
 }
 
-/**

- * Returns the display which the currently running thread is

- * the user-interface thread for, or null if the currently

- * running thread is not a user-interface thread for any display.

- *

- * @return the current display

+/**
+ * Returns the display which the currently running thread is
+ * the user-interface thread for, or null if the currently
+ * running thread is not a user-interface thread for any display.
+ *
+ * @return the current display
  */
 public static synchronized Display getCurrent () {
 	Thread current = Thread.currentThread ();
@@ -645,16 +645,16 @@ public static synchronized Display getCurrent () {
 	return null;
 }
 
-/**

- * Returns the control which the on-screen pointer is currently

- * over top of, or null if it is not currently over one of the

- * controls built by the currently running application.

- *

- * @return the control under the cursor

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the control which the on-screen pointer is currently
+ * over top of, or null if it is not currently over one of the
+ * controls built by the currently running application.
+ *
+ * @return the control under the cursor
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Control getCursorControl () {
 	checkDevice();
@@ -685,15 +685,15 @@ boolean filters (int eventType) {
 	return filterTable.hooks (eventType);
 }
 
-/**

- * Returns the location of the on-screen pointer relative

- * to the top left corner of the screen.

- *

- * @return the cursor location

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the location of the on-screen pointer relative
+ * to the top left corner of the screen.
+ *
+ * @return the cursor location
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Point getCursorLocation () {
 	checkDevice ();
@@ -702,29 +702,29 @@ public Point getCursorLocation () {
 	return new Point (x [0], y [0]);
 }
 
-/**

- * Returns the application defined property of the receiver

- * with the specified name, or null if it has not been set.

- * <p>

- * Applications may have associated arbitrary objects with the

- * receiver in this fashion. If the objects stored in the

- * properties need to be notified when the display is disposed

- * of, it is the application's responsibility provide a

- * <code>disposeExec()</code> handler which does so.

- * </p>

- *

- * @param key the name of the property

- * @return the value of the property or null if it has not been set

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setData

- * @see #disposeExec

+/**
+ * Returns the application defined property of the receiver
+ * with the specified name, or null if it has not been set.
+ * <p>
+ * Applications may have associated arbitrary objects with the
+ * receiver in this fashion. If the objects stored in the
+ * properties need to be notified when the display is disposed
+ * of, it is the application's responsibility provide a
+ * <code>disposeExec()</code> handler which does so.
+ * </p>
+ *
+ * @param key the name of the property
+ * @return the value of the property or null if it has not been set
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setData
+ * @see #disposeExec
  */
 public Object getData (String key) {
 	checkDevice ();
@@ -736,27 +736,27 @@ public Object getData (String key) {
 	return null;
 }
 
-/**

- * Returns the application defined, display specific data

- * associated with the receiver, or null if it has not been

- * set. The <em>display specific data</em> is a single,

- * unnamed field that is stored with every display. 

- * <p>

- * Applications may put arbitrary objects in this field. If

- * the object stored in the display specific data needs to

- * be notified when the display is disposed of, it is the

- * application's responsibility provide a

- * <code>disposeExec()</code> handler which does so.

- * </p>

- *

- * @return the display specific data

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>

- * </ul>

- *

- * @see #setData

- * @see #disposeExec

+/**
+ * Returns the application defined, display specific data
+ * associated with the receiver, or null if it has not been
+ * set. The <em>display specific data</em> is a single,
+ * unnamed field that is stored with every display. 
+ * <p>
+ * Applications may put arbitrary objects in this field. If
+ * the object stored in the display specific data needs to
+ * be notified when the display is disposed of, it is the
+ * application's responsibility provide a
+ * <code>disposeExec()</code> handler which does so.
+ * </p>
+ *
+ * @return the display specific data
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>
+ * </ul>
+ *
+ * @see #setData
+ * @see #disposeExec
  */
 public Object getData () {
 	checkDevice ();
@@ -782,12 +782,12 @@ public Point getDPI () {
 	return new Point (dpi, dpi);
 }
 
-/**

- * Returns the default display. One is created (making the

- * thread that invokes this method its user-interface thread)

- * if it did not already exist.

- *

- * @return the default display

+/**
+ * Returns the default display. One is created (making the
+ * thread that invokes this method its user-interface thread)
+ * if it did not already exist.
+ *
+ * @return the default display
  */
 public static synchronized Display getDefault () {
 	if (Default == null) Default = new Display ();
@@ -805,33 +805,33 @@ public int getDismissalAlignment () {
 	return SWT.RIGHT;
 }
 
-/**

- * Returns the longest duration, in milliseconds, between

- * two mouse button clicks that will be considered a

- * <em>double click</em> by the underlying operating system.

- *

- * @return the double click time

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the longest duration, in milliseconds, between
+ * two mouse button clicks that will be considered a
+ * <em>double click</em> by the underlying operating system.
+ *
+ * @return the double click time
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getDoubleClickTime () {
 	checkDevice ();
 	return DOUBLE_CLICK_TIME;
 }
 
-/**

- * Returns the control which currently has keyboard focus,

- * or null if keyboard events are not currently going to

- * any of the controls built by the currently running

- * application.

- *

- * @return the control under the cursor

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the control which currently has keyboard focus,
+ * or null if keyboard events are not currently going to
+ * any of the controls built by the currently running
+ * application.
+ *
+ * @return the control under the cursor
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Control getFocusControl () {
 	checkDevice ();
@@ -857,16 +857,16 @@ public int getDepth () {
 	return visual.depth;
 }
 
-/**

- * Returns the maximum allowed depth of icons on this display.

- * On some platforms, this may be different than the actual

- * depth of the display.

- *

- * @return the maximum icon depth

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the maximum allowed depth of icons on this display.
+ * On some platforms, this may be different than the actual
+ * depth of the display.
+ *
+ * @return the maximum icon depth
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getIconDepth () {
 	checkDevice ();
@@ -877,15 +877,15 @@ int getLastEventTime () {
 	return OS.gtk_get_current_event_time ();
 }
 
-/**

- * Returns an array containing all shells which have not been

- * disposed and have the receiver as their display.

- *

- * @return the receiver's shells

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns an array containing all shells which have not been
+ * disposed and have the receiver as their display.
+ *
+ * @return the receiver's shells
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Shell [] getShells () {
 	checkDevice ();
@@ -908,39 +908,39 @@ public Shell [] getShells () {
 	return result;
 }
 
-/**

- * Returns the thread that has invoked <code>syncExec</code>

- * or null if no such runnable is currently being invoked by

- * the user-interface thread.

- * <p>

- * Note: If a runnable invoked by asyncExec is currently

- * running, this method will return null.

- * </p>

- *

- * @return the receiver's sync-interface thread

+/**
+ * Returns the thread that has invoked <code>syncExec</code>
+ * or null if no such runnable is currently being invoked by
+ * the user-interface thread.
+ * <p>
+ * Note: If a runnable invoked by asyncExec is currently
+ * running, this method will return null.
+ * </p>
+ *
+ * @return the receiver's sync-interface thread
  */
 public Thread getSyncThread () {
 	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
 	return synchronizer.syncThread;
 }
 
-/**

- * Returns the matching standard color for the given

- * constant, which should be one of the color constants

- * specified in class <code>SWT</code>. Any value other

- * than one of the SWT color constants which is passed

- * in will result in the color black. This color should

- * not be free'd because it was allocated by the system,

- * not the application.

- *

- * @param id the color constant

- * @return the matching color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SWT

+/**
+ * Returns the matching standard color for the given
+ * constant, which should be one of the color constants
+ * specified in class <code>SWT</code>. Any value other
+ * than one of the SWT color constants which is passed
+ * in will result in the color black. This color should
+ * not be free'd because it was allocated by the system,
+ * not the application.
+ *
+ * @param id the color constant
+ * @return the matching color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SWT
  */
 public Color getSystemColor (int id) {
 	checkDevice ();
@@ -1135,35 +1135,35 @@ void initializeSystemResources () {
 	OS.gtk_widget_destroy (shellHandle);
 }
 
-/**

- * Returns a reasonable font for applications to use.

- * On some platforms, this will match the "default font"

- * or "system font" if such can be found.  This font

- * should not be free'd because it was allocated by the

- * system, not the application.

- * <p>

- * Typically, applications which want the default look

- * should simply not set the font on the widgets they

- * create. Widgets are always created with the correct

- * default font for the class of user-interface component

- * they represent.

- * </p>

- *

- * @return a font

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a reasonable font for applications to use.
+ * On some platforms, this will match the "default font"
+ * or "system font" if such can be found.  This font
+ * should not be free'd because it was allocated by the
+ * system, not the application.
+ * <p>
+ * Typically, applications which want the default look
+ * should simply not set the font on the widgets they
+ * create. Widgets are always created with the correct
+ * default font for the class of user-interface component
+ * they represent.
+ * </p>
+ *
+ * @return a font
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Font getSystemFont () {
 	checkDevice ();
 	return Font.gtk_new (this, defaultFont);
 }
 
-/**

- * Returns the user-interface thread for the receiver.

- *

- * @return the receiver's user-interface thread

+/**
+ * Returns the user-interface thread for the receiver.
+ *
+ * @return the receiver's user-interface thread
  */
 public Thread getThread () {
 	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
@@ -1214,39 +1214,39 @@ void initializeCallbacks () {
 	if (treeSelectionProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 }
 
-/**	 

- * Invokes platform specific functionality to dispose a GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Display</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param handle the platform specific GC handle

- * @param data the platform specific GC data 

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to dispose a GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Display</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param handle the platform specific GC handle
+ * @param data the platform specific GC data 
+ *
+ * @private
  */
 public void internal_dispose_GC (int gdkGC, GCData data) {
 	OS.g_object_unref (gdkGC);
 }
 
-/**	 

- * Invokes platform specific functionality to allocate a new GC handle.

- * <p>

- * <b>IMPORTANT:</b> This method is <em>not</em> part of the public

- * API for <code>Display</code>. It is marked public only so that it

- * can be shared within the packages provided by SWT. It is not

- * available on all platforms, and should never be called from

- * application code.

- * </p>

- *

- * @param data the platform specific GC data 

- * @return the platform specific GC handle

- *

- * @private

+/**	 
+ * Invokes platform specific functionality to allocate a new GC handle.
+ * <p>
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+ * API for <code>Display</code>. It is marked public only so that it
+ * can be shared within the packages provided by SWT. It is not
+ * available on all platforms, and should never be called from
+ * application code.
+ * </p>
+ *
+ * @param data the platform specific GC data 
+ * @return the platform specific GC handle
+ *
+ * @private
  */
 public int internal_new_GC (GCData data) {
 	if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
@@ -1293,27 +1293,27 @@ void postEvent (Event event) {
 	eventQueue [index] = event;
 }
 
-/**

- * Reads an event from the operating system's event queue,

- * dispatches it appropriately, and returns <code>true</code>

- * if there is potentially more work to do, or <code>false</code>

- * if the caller can sleep until another event is placed on

- * the event queue.

- * <p>

- * In addition to checking the system event queue, this method also

- * checks if any inter-thread messages (created by <code>syncExec()</code>

- * or <code>asyncExec()</code>) are waiting to be processed, and if

- * so handles them before returning.

- * </p>

- *

- * @return <code>false</code> if the caller can sleep upon return from this method

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #sleep

- * @see #wake

+/**
+ * Reads an event from the operating system's event queue,
+ * dispatches it appropriately, and returns <code>true</code>
+ * if there is potentially more work to do, or <code>false</code>
+ * if the caller can sleep until another event is placed on
+ * the event queue.
+ * <p>
+ * In addition to checking the system event queue, this method also
+ * checks if any inter-thread messages (created by <code>syncExec()</code>
+ * or <code>asyncExec()</code>) are waiting to be processed, and if
+ * so handles them before returning.
+ * </p>
+ *
+ * @return <code>false</code> if the caller can sleep upon return from this method
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #sleep
+ * @see #wake
  */
 public boolean readAndDispatch () {
 	checkDevice ();
@@ -1447,24 +1447,24 @@ void removeFilter (int eventType, Listener listener) {
 	if (filterTable.size () == 0) filterTable = null;
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notifed when an event of the given type occurs.

- *

- * @param eventType the type of event to listen for

- * @param listener the listener which should no longer be notified when the event occurs

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see Listener

- * @see #addListener

- * 

- * @since 2.0 

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notifed when an event of the given type occurs.
+ *
+ * @param eventType the type of event to listen for
+ * @param listener the listener which should no longer be notified when the event occurs
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see Listener
+ * @see #addListener
+ * 
+ * @since 2.0 
  */
 public void removeListener (int eventType, Listener listener) {
 	checkDevice ();
@@ -1524,12 +1524,12 @@ boolean runDeferredEvents () {
 	return true;
 }
 
-/**

- * On platforms which support it, sets the application name

- * to be the argument. On Motif, for example, this can be used

- * to set the name used for resource lookup.

- *

- * @param name the new app name

+/**
+ * On platforms which support it, sets the application name
+ * to be the argument. On Motif, for example, this can be used
+ * to set the name used for resource lookup.
+ *
+ * @param name the new app name
  */
 public static void setAppName (String name) {
 	APP_NAME = name;
@@ -1540,17 +1540,17 @@ public void setCursorLocation (int x, int y) {
 	/* This is not supported on GTK */
 }
 
-/**

- * Sets the location of the on-screen pointer relative to the top left corner

- * of the screen.  <b>Note: It is typically considered bad practice for a

- * program to move the on-screen pointer location.</b>

- *

- * @param point new position 

- * @since 2.0

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- *    <li>ERROR_NULL_ARGUMENT - if the point is null

- * </ul>

+/**
+ * Sets the location of the on-screen pointer relative to the top left corner
+ * of the screen.  <b>Note: It is typically considered bad practice for a
+ * program to move the on-screen pointer location.</b>
+ *
+ * @param point new position 
+ * @since 2.0
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ *    <li>ERROR_NULL_ARGUMENT - if the point is null
+ * </ul>
  */
 public void setCursorLocation (Point point) {
 	checkDevice ();
@@ -1558,29 +1558,29 @@ public void setCursorLocation (Point point) {
 	setCursorLocation (point.x, point.y);
 }
 
-/**

- * Sets the application defined property of the receiver

- * with the specified name to the given argument.

- * <p>

- * Applications may have associated arbitrary objects with the

- * receiver in this fashion. If the objects stored in the

- * properties need to be notified when the display is disposed

- * of, it is the application's responsibility provide a

- * <code>disposeExec()</code> handler which does so.

- * </p>

- *

- * @param key the name of the property

- * @param value the new value for the property

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #setData

- * @see #disposeExec

+/**
+ * Sets the application defined property of the receiver
+ * with the specified name to the given argument.
+ * <p>
+ * Applications may have associated arbitrary objects with the
+ * receiver in this fashion. If the objects stored in the
+ * properties need to be notified when the display is disposed
+ * of, it is the application's responsibility provide a
+ * <code>disposeExec()</code> handler which does so.
+ * </p>
+ *
+ * @param key the name of the property
+ * @param value the new value for the property
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setData
+ * @see #disposeExec
  */
 public void setData (String key, Object value) {
 	checkDevice ();
@@ -1630,45 +1630,45 @@ public void setData (String key, Object value) {
 	values = newValues;
 }
 
-/**

- * Sets the application defined, display specific data

- * associated with the receiver, to the argument.

- * The <em>display specific data</em> is a single,

- * unnamed field that is stored with every display. 

- * <p>

- * Applications may put arbitrary objects in this field. If

- * the object stored in the display specific data needs to

- * be notified when the display is disposed of, it is the

- * application's responsibility provide a

- * <code>disposeExec()</code> handler which does so.

- * </p>

- *

- * @param data the new display specific data

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>

- * </ul>

- *

- * @see #getData

- * @see #disposeExec

+/**
+ * Sets the application defined, display specific data
+ * associated with the receiver, to the argument.
+ * The <em>display specific data</em> is a single,
+ * unnamed field that is stored with every display. 
+ * <p>
+ * Applications may put arbitrary objects in this field. If
+ * the object stored in the display specific data needs to
+ * be notified when the display is disposed of, it is the
+ * application's responsibility provide a
+ * <code>disposeExec()</code> handler which does so.
+ * </p>
+ *
+ * @param data the new display specific data
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>
+ * </ul>
+ *
+ * @see #getData
+ * @see #disposeExec
  */
 public void setData (Object data) {
 	checkDevice ();
 	this.data = data;
 }
 
-/**

- * Sets the synchronizer used by the display to be

- * the argument, which can not be null.

- *

- * @param synchronizer the new synchronizer for the display (must not be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the synchronizer is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the synchronizer used by the display to be
+ * the argument, which can not be null.
+ *
+ * @param synchronizer the new synchronizer for the display (must not be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the synchronizer is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setSynchronizer (Synchronizer synchronizer) {
 	checkDevice ();
@@ -1712,18 +1712,18 @@ void showIMWindow (Control control) {
 	if (pangoAttrs [0] != 0) OS.pango_attr_list_unref (pangoAttrs [0]);	
 }
 
-/**

- * Causes the user-interface thread to <em>sleep</em> (that is,

- * to be put in a state where it does not consume CPU cycles)

- * until an event is received or it is otherwise awakened.

- *

- * @return <code>true</code> if an event requiring dispatching was placed on the queue.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #wake

+/**
+ * Causes the user-interface thread to <em>sleep</em> (that is,
+ * to be put in a state where it does not consume CPU cycles)
+ * until an event is received or it is otherwise awakened.
+ *
+ * @return <code>true</code> if an event requiring dispatching was placed on the queue.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #wake
  */
 public boolean sleep () {
 	checkDevice ();
@@ -1734,23 +1734,23 @@ public boolean sleep () {
 	return true;
 }
 
-/**

- * Causes the <code>run()</code> method of the runnable to

- * be invoked by the user-interface thread after the specified

- * number of milliseconds have elapsed. If milliseconds is less

- * than zero, the runnable is not executed.

- *

- * @param milliseconds the delay before running the runnable

- * @param runnable code to run on the user-interface thread

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the runnable is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #asyncExec

+/**
+ * Causes the <code>run()</code> method of the runnable to
+ * be invoked by the user-interface thread after the specified
+ * number of milliseconds have elapsed. If milliseconds is less
+ * than zero, the runnable is not executed.
+ *
+ * @param milliseconds the delay before running the runnable
+ * @param runnable code to run on the user-interface thread
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the runnable is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #asyncExec
  */
 public void timerExec (int milliseconds, Runnable runnable) {
 	checkDevice ();
@@ -1843,19 +1843,19 @@ void setCurrentCaret (Caret caret) {
 	caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0); 
 }
 
-/**

- * Causes the <code>run()</code> method of the runnable to

- * be invoked by the user-interface thread at the next 

- * reasonable opportunity. The thread which calls this method

- * is suspended until the runnable completes.

- *

- * @param runnable code to run on the user-interface thread.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_FAILED_EXEC - if an exception occured when executing the runnable</li>

- * </ul>

- *

- * @see #asyncExec

+/**
+ * Causes the <code>run()</code> method of the runnable to
+ * be invoked by the user-interface thread at the next 
+ * reasonable opportunity. The thread which calls this method
+ * is suspended until the runnable completes.
+ *
+ * @param runnable code to run on the user-interface thread.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_FAILED_EXEC - if an exception occured when executing the runnable</li>
+ * </ul>
+ *
+ * @see #asyncExec
  */
 public void syncExec (Runnable runnable) {
 	if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
@@ -1876,11 +1876,11 @@ static int untranslateKey (int key) {
 	return 0;
 }
 
-/**

- * Forces all outstanding paint requests for the display

- * to be processed before this method returns.

- *

- * @see Control#update

+/**
+ * Forces all outstanding paint requests for the display
+ * to be processed before this method returns.
+ *
+ * @see Control#update
  */
 public void update () {
 	checkDevice ();
@@ -1891,12 +1891,12 @@ public void update () {
 	}	
 }
 
-/**

- * If the receiver's user-interface thread was <code>sleep</code>'ing, 

- * causes it to be awakened and start running again. Note that this

- * method may be called from any thread.

- *

- * @see #sleep

+/**
+ * If the receiver's user-interface thread was <code>sleep</code>'ing, 
+ * causes it to be awakened and start running again. Note that this
+ * method may be called from any thread.
+ *
+ * @see #sleep
  */
 public void wake () {
 	// NOT IMPLEMENTED - need to wake up the event loop
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
index 1ec06e658a..ac02ff869f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
@@ -1,307 +1,307 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-

-/**

- * Instances of this class allow the user to navigate

- * the file system and select or enter a file name.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>SAVE, OPEN, MULTI</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class FileDialog extends Dialog {

-	String [] filterNames = new String [0];

-	String [] filterExtensions = new String [0];

-	String filterPath = "";

-	String fileName = "";

-	String[] fileNames;

-	String fullPath = "";

-	int handle;

-	static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);

-	

-/**

- * Constructs a new instance of this class given only its

- * parent.

- * <p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+
+/**
+ * Instances of this class allow the user to navigate
+ * the file system and select or enter a file name.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>SAVE, OPEN, MULTI</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
-public FileDialog (Shell parent) {

-	this (parent, SWT.PRIMARY_MODAL);

-}

-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+public class FileDialog extends Dialog {
+	String [] filterNames = new String [0];
+	String [] filterExtensions = new String [0];
+	String filterPath = "";
+	String fileName = "";
+	String[] fileNames;
+	String fullPath = "";
+	int handle;
+	static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
+	
+/**
+ * Constructs a new instance of this class given only its
+ * parent.
+ * <p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public FileDialog (Shell parent, int style) {

-	super (parent, style);

-	checkSubclass ();

-}

-/**

- * Returns the path of the first file that was

- * selected in the dialog relative to the filter path

- * 

- * @return the relative path of the file

+public FileDialog (Shell parent) {
+	this (parent, SWT.PRIMARY_MODAL);
+}
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public String getFileName () {

-	return fileName;

-}

-/**

- * Returns the paths of all files that were selected

- * in the dialog relative to the filter path, or null

- * if none are available.

- * 

- * @return the relative paths of the files

+public FileDialog (Shell parent, int style) {
+	super (parent, style);
+	checkSubclass ();
+}
+/**
+ * Returns the path of the first file that was
+ * selected in the dialog relative to the filter path
+ * 
+ * @return the relative path of the file
  */
-public String [] getFileNames () {

-	return fileNames;

-}

-/**

- * Returns the file extensions which the dialog will

- * use to filter the files it shows.

- *

- * @return the file extensions filter

+public String getFileName () {
+	return fileName;
+}
+/**
+ * Returns the paths of all files that were selected
+ * in the dialog relative to the filter path, or null
+ * if none are available.
+ * 
+ * @return the relative paths of the files
  */
-public String [] getFilterExtensions () {

-	return filterExtensions;

-}

-/**

- * Returns the file names which the dialog will

- * use to filter the files it shows.

- *

- * @return the file name filter

+public String [] getFileNames () {
+	return fileNames;
+}
+/**
+ * Returns the file extensions which the dialog will
+ * use to filter the files it shows.
+ *
+ * @return the file extensions filter
  */
-public String [] getFilterNames () {

-	return filterNames;

-}

-/**

- * Returns the directory path that the dialog will use.

- * File names in this path will appear in the dialog,

- * filtered according to the filter extensions.

- *

- * @return the directory path string

- * 

- * @see #setFilterExtensions

+public String [] getFilterExtensions () {
+	return filterExtensions;
+}
+/**
+ * Returns the file names which the dialog will
+ * use to filter the files it shows.
+ *
+ * @return the file name filter
  */
-public String getFilterPath () {

-	return filterPath;

-}

-/**

- * Makes the dialog visible and brings it to the front

- * of the display.

- *

- * @return a string describing the absolute path of the first selected file,

- *         or null if the dialog was cancelled or an error occurred

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>

- * </ul>

+public String [] getFilterNames () {
+	return filterNames;
+}
+/**
+ * Returns the directory path that the dialog will use.
+ * File names in this path will appear in the dialog,
+ * filtered according to the filter extensions.
+ *
+ * @return the directory path string
+ * 
+ * @see #setFilterExtensions
  */
-public String open () {

-	byte [] titleBytes = Converter.wcsToMbcs (null, title, true);

-	handle = OS.gtk_file_selection_new (titleBytes);

-	if (parent != null) {

-		OS.gtk_window_set_transient_for (handle, parent.topHandle());

-	}

-	String answer = null;

-	preset ();

-	int response = OS.gtk_dialog_run (handle);

-	if (response == OS.GTK_RESPONSE_OK) {

-		int fileNamePtr = OS.gtk_file_selection_get_filename (handle);

-		int utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);

-		int [] items_written = new int [1];

-		int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

-		int length = items_written [0];

-		char [] buffer = new char [length];

-		OS.memmove (buffer, utf16Ptr, length * 2);

-		String osAnswer = new String (buffer);

-		OS.g_free (utf16Ptr);

-		OS.g_free (utf8Ptr);

-		answer = interpretOsAnswer (osAnswer);

-	}

-	OS.gtk_widget_destroy (handle);

-	return answer;

-}

-/**

- * Set the initial filename which the dialog will

- * select by default when opened to the argument,

- * which may be null.  The name will be prefixed with

- * the filter path when one is supplied.

- * 

- * @param string the file name

+public String getFilterPath () {
+	return filterPath;
+}
+/**
+ * Makes the dialog visible and brings it to the front
+ * of the display.
+ *
+ * @return a string describing the absolute path of the first selected file,
+ *         or null if the dialog was cancelled or an error occurred
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>
+ * </ul>
  */
-public void setFileName (String string) {

-	fileName = string;

-}

-/**

- * Set the file extensions which the dialog will

- * use to filter the files it shows to the argument,

- * which may be null.

- *

- * @param extensions the file extension filter

+public String open () {
+	byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
+	handle = OS.gtk_file_selection_new (titleBytes);
+	if (parent != null) {
+		OS.gtk_window_set_transient_for (handle, parent.topHandle());
+	}
+	String answer = null;
+	preset ();
+	int response = OS.gtk_dialog_run (handle);
+	if (response == OS.GTK_RESPONSE_OK) {
+		int fileNamePtr = OS.gtk_file_selection_get_filename (handle);
+		int utf8Ptr = OS.g_filename_to_utf8 (fileNamePtr, -1, null, null, null);
+		int [] items_written = new int [1];
+		int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+		int length = items_written [0];
+		char [] buffer = new char [length];
+		OS.memmove (buffer, utf16Ptr, length * 2);
+		String osAnswer = new String (buffer);
+		OS.g_free (utf16Ptr);
+		OS.g_free (utf8Ptr);
+		answer = interpretOsAnswer (osAnswer);
+	}
+	OS.gtk_widget_destroy (handle);
+	return answer;
+}
+/**
+ * Set the initial filename which the dialog will
+ * select by default when opened to the argument,
+ * which may be null.  The name will be prefixed with
+ * the filter path when one is supplied.
+ * 
+ * @param string the file name
  */
-public void setFilterExtensions (String [] extensions) {

-	filterExtensions = extensions;

-}

-/**

- * Sets the file names which the dialog will

- * use to filter the files it shows to the argument,

- * which may be null.

- *

- * @param names the file name filter

+public void setFileName (String string) {
+	fileName = string;
+}
+/**
+ * Set the file extensions which the dialog will
+ * use to filter the files it shows to the argument,
+ * which may be null.
+ *
+ * @param extensions the file extension filter
  */
-public void setFilterNames (String [] names) {

-	filterNames = names;

-}

-/**

- * Sets the directory path that the dialog will use

- * to the argument, which may be null. File names in this

- * path will appear in the dialog, filtered according

- * to the filter extensions.

- *

- * @param string the directory path

- * 

- * @see #setFilterExtensions

+public void setFilterExtensions (String [] extensions) {
+	filterExtensions = extensions;
+}
+/**
+ * Sets the file names which the dialog will
+ * use to filter the files it shows to the argument,
+ * which may be null.
+ *
+ * @param names the file name filter
  */
-public void setFilterPath (String string) {

-	filterPath = string;

-}

-void preset() {

-	OS.gtk_file_selection_set_select_multiple(handle, (style & SWT.MULTI) != 0);

-

-	/* Calculate the fully-specified file name and convert to bytes */

-	StringBuffer stringBuffer = new StringBuffer ();

-	if (filterPath == null) {

-		filterPath = "";

-	} else {

-		if (filterPath.length () > 0) {

-			stringBuffer.append (filterPath);

-			if (filterPath.charAt (filterPath.length () - 1) != SEPARATOR) {

-				stringBuffer.append (SEPARATOR);

-			}

-		}

-	}

-	if (fileName == null) {

-		fileName = "";

-	} else {

-		stringBuffer.append (fileName);

-	}

-	fullPath = stringBuffer.toString ();

-	int length = fullPath.length ();

-	char [] buffer = new char [length + 1];

-	fullPath.getChars (0, length, buffer, 0);

-	int utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);

-	int fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);

-	OS.gtk_file_selection_set_filename (handle, fileNamePtr);

-	OS.g_free (utf8Ptr);

-	OS.g_free (fileNamePtr);

-				

-	/* Set the extension */

-	if (filterNames == null) filterNames = new String [0];

-	if (filterExtensions == null) filterExtensions = new String [0];

-	if (filterExtensions.length == 1) {

-		String ext = filterExtensions [0];

-		byte [] extBytes = Converter.wcsToMbcs (null, ext, true);

-		OS.gtk_file_selection_complete (handle, extBytes);

-	}	

-	fullPath = null;

-}

-String interpretOsAnswer(String osAnswer) {

-	if (osAnswer==null) return null;

-	int separatorIndex = osAnswer.lastIndexOf (SEPARATOR);

-	if (separatorIndex+1 == osAnswer.length ()) return null;

-	

-	String answer = fullPath = osAnswer;

-	fileName = fullPath.substring (separatorIndex+1);

-	filterPath = fullPath.substring (0, separatorIndex);

-	if ((style & SWT.MULTI) == 0) {

-		fileNames = new String[] {fileName};

-	} else {

-		int namesPtr = OS.gtk_file_selection_get_selections (handle);

-		int namesPtr1 = namesPtr;

-		int [] namePtr = new int [1];

-		OS.memmove (namePtr, namesPtr1, 4);

-		int length = 0;

-		while (namePtr[0] != 0) {

-			length++;

-			namesPtr1+=4;

-			OS.memmove(namePtr, namesPtr1, 4);

-		}

-		fileNames = new String [length];

-		namePtr = new int [length];

-		OS.memmove (namePtr, namesPtr, length * 4);

-		for (int i = 0; i < length; i++) {			

-			int utf8Ptr = OS.g_filename_to_utf8 (namePtr [i], -1, null, null, null);

-			int [] items_written = new int [1];

-			int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);

-			char[] buffer = new char [items_written [0]];

-			OS.memmove (buffer, utf16Ptr, items_written [0] * 2);

-			String name = new String (buffer);

-			fileNames [i] = name.substring (name.lastIndexOf (SEPARATOR) + 1);

-			OS.g_free (utf16Ptr);

-			OS.g_free (utf8Ptr);

-		}

-		OS.g_strfreev (namesPtr);

-	}

-	return answer;

-}

-

-}

+public void setFilterNames (String [] names) {
+	filterNames = names;
+}
+/**
+ * Sets the directory path that the dialog will use
+ * to the argument, which may be null. File names in this
+ * path will appear in the dialog, filtered according
+ * to the filter extensions.
+ *
+ * @param string the directory path
+ * 
+ * @see #setFilterExtensions
+ */
+public void setFilterPath (String string) {
+	filterPath = string;
+}
+void preset() {
+	OS.gtk_file_selection_set_select_multiple(handle, (style & SWT.MULTI) != 0);
+
+	/* Calculate the fully-specified file name and convert to bytes */
+	StringBuffer stringBuffer = new StringBuffer ();
+	if (filterPath == null) {
+		filterPath = "";
+	} else {
+		if (filterPath.length () > 0) {
+			stringBuffer.append (filterPath);
+			if (filterPath.charAt (filterPath.length () - 1) != SEPARATOR) {
+				stringBuffer.append (SEPARATOR);
+			}
+		}
+	}
+	if (fileName == null) {
+		fileName = "";
+	} else {
+		stringBuffer.append (fileName);
+	}
+	fullPath = stringBuffer.toString ();
+	int length = fullPath.length ();
+	char [] buffer = new char [length + 1];
+	fullPath.getChars (0, length, buffer, 0);
+	int utf8Ptr = OS.g_utf16_to_utf8 (buffer, -1, null, null, null);
+	int fileNamePtr = OS.g_filename_from_utf8 (utf8Ptr, -1, null, null, null);
+	OS.gtk_file_selection_set_filename (handle, fileNamePtr);
+	OS.g_free (utf8Ptr);
+	OS.g_free (fileNamePtr);
+				
+	/* Set the extension */
+	if (filterNames == null) filterNames = new String [0];
+	if (filterExtensions == null) filterExtensions = new String [0];
+	if (filterExtensions.length == 1) {
+		String ext = filterExtensions [0];
+		byte [] extBytes = Converter.wcsToMbcs (null, ext, true);
+		OS.gtk_file_selection_complete (handle, extBytes);
+	}	
+	fullPath = null;
+}
+String interpretOsAnswer(String osAnswer) {
+	if (osAnswer==null) return null;
+	int separatorIndex = osAnswer.lastIndexOf (SEPARATOR);
+	if (separatorIndex+1 == osAnswer.length ()) return null;
+	
+	String answer = fullPath = osAnswer;
+	fileName = fullPath.substring (separatorIndex+1);
+	filterPath = fullPath.substring (0, separatorIndex);
+	if ((style & SWT.MULTI) == 0) {
+		fileNames = new String[] {fileName};
+	} else {
+		int namesPtr = OS.gtk_file_selection_get_selections (handle);
+		int namesPtr1 = namesPtr;
+		int [] namePtr = new int [1];
+		OS.memmove (namePtr, namesPtr1, 4);
+		int length = 0;
+		while (namePtr[0] != 0) {
+			length++;
+			namesPtr1+=4;
+			OS.memmove(namePtr, namesPtr1, 4);
+		}
+		fileNames = new String [length];
+		namePtr = new int [length];
+		OS.memmove (namePtr, namesPtr, length * 4);
+		for (int i = 0; i < length; i++) {			
+			int utf8Ptr = OS.g_filename_to_utf8 (namePtr [i], -1, null, null, null);
+			int [] items_written = new int [1];
+			int utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+			char[] buffer = new char [items_written [0]];
+			OS.memmove (buffer, utf16Ptr, items_written [0] * 2);
+			String name = new String (buffer);
+			fileNames [i] = name.substring (name.lastIndexOf (SEPARATOR) + 1);
+			OS.g_free (utf16Ptr);
+			OS.g_free (utf8Ptr);
+		}
+		OS.g_strfreev (namesPtr);
+	}
+	return answer;
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
index ff6c96be46..3ab4e64e66 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
@@ -1,177 +1,177 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-

-/**

- * Instances of this class allow the user to select a font

- * from all available fonts in the system.

- * <p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class FontDialog extends Dialog {

-	FontData fontData;

-	RGB rgb;

-/**

- * Constructs a new instance of this class given only its

- * parent.

- * <p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+
+/**
+ * Instances of this class allow the user to select a font
+ * from all available fonts in the system.
+ * <p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
-public FontDialog (Shell parent) {

-	this (parent, SWT.PRIMARY_MODAL);

-}

-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- * Note: Currently, null can be passed in for the parent.

- * This has the effect of creating the dialog on the currently active

- * display if there is one. If there is no current display, the 

- * dialog is created on a "default" display. <b>Passing in null as

- * the parent is not considered to be good coding style,

- * and may not be supported in a future release of SWT.</b>

- * </p>

- *

- * @param parent a shell which will be the parent of the new instance

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

+public class FontDialog extends Dialog {
+	FontData fontData;
+	RGB rgb;
+/**
+ * Constructs a new instance of this class given only its
+ * parent.
+ * <p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public FontDialog (Shell parent, int style) {

-	super (parent, style);

-	checkSubclass ();

-}

-

-/**

- * Returns a FontData object describing the font that was

- * selected in the dialog, or null if none is available.

- * 

- * @return the FontData for the selected font, or null

+public FontDialog (Shell parent) {
+	this (parent, SWT.PRIMARY_MODAL);
+}
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ * Note: Currently, null can be passed in for the parent.
+ * This has the effect of creating the dialog on the currently active
+ * display if there is one. If there is no current display, the 
+ * dialog is created on a "default" display. <b>Passing in null as
+ * the parent is not considered to be good coding style,
+ * and may not be supported in a future release of SWT.</b>
+ * </p>
+ *
+ * @param parent a shell which will be the parent of the new instance
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  */
-public FontData getFontData() {

-	return fontData;

-}

-

-/**

- * Returns the currently selected color in the receiver.

- *

- * @return the RGB value for the selected color, may be null

- *

- * @see PaletteData#getRGBs

- */

-public RGB getRGB () {

-	return rgb;

-}

-

-/**

- * Makes the dialog visible and brings it to the front

- * of the display.

- *

- * @return a FontData object describing the font that was selected,

- *         or null if the dialog was cancelled or an error occurred

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>

- * </ul>

+public FontDialog (Shell parent, int style) {
+	super (parent, style);
+	checkSubclass ();
+}
+
+/**
+ * Returns a FontData object describing the font that was
+ * selected in the dialog, or null if none is available.
+ * 
+ * @return the FontData for the selected font, or null
  */
-public FontData open () {

-	int handle;

-	byte [] titleBytes;

-	titleBytes = Converter.wcsToMbcs (null, title, true);

-	handle = OS.gtk_font_selection_dialog_new (titleBytes);

-	if (parent!=null) {

-		OS.gtk_window_set_transient_for(handle, parent.topHandle());

-	}

-	if (fontData != null) {

-		Display display = parent != null ? parent.getDisplay () : Display.getCurrent ();

-		Font font = new Font (display, fontData);

-		int fontName = OS.pango_font_description_to_string (font.handle);

-		int length = OS.strlen (fontName);

-		byte [] buffer = new byte [length + 1];

-		OS.memmove (buffer, fontName, length);

-		font.dispose();

-		OS.g_free (fontName);

-		OS.gtk_font_selection_dialog_set_font_name (handle, buffer);

-	}

-	int response = OS.gtk_dialog_run(handle);

-	boolean success = response == OS.GTK_RESPONSE_OK; 

-	if (success) {

-		int fontName = OS.gtk_font_selection_dialog_get_font_name (handle);

-		int length = OS.strlen (fontName);

-		byte [] buffer = new byte [length + 1];

-		OS.memmove (buffer, fontName, length);

-		int fontDesc = OS.pango_font_description_from_string (buffer);

-		Display display = parent != null ? parent.getDisplay () : Display.getCurrent ();

-		Font font = Font.gtk_new (display, fontDesc);

-		fontData = font.getFontData () [0];

-		OS.pango_font_description_free (fontDesc);		

-	}

-	OS.gtk_widget_destroy(handle);

-	if (!success) return null;

-	return fontData;

-}

-/**

- * Sets a FontData object describing the font to be

- * selected by default in the dialog, or null to let

- * the platform choose one.

- * 

- * @param fontData the FontData to use initially, or null

+public FontData getFontData() {
+	return fontData;
+}
+
+/**
+ * Returns the currently selected color in the receiver.
+ *
+ * @return the RGB value for the selected color, may be null
+ *
+ * @see PaletteData#getRGBs
  */
-public void setFontData (FontData fontData) {

-	this.fontData = fontData;

-}

-/**

- * Returns the receiver's selected color to be the argument.

- *

- * @param rgb the new RGB value for the selected color, may be

- *        null to let the platform to select a default when

- *        open() is called

- *

- * @see PaletteData#getRGBs

- */

-public void setRGB (RGB rgb) {

-	this.rgb = rgb;

-}

-}

+public RGB getRGB () {
+	return rgb;
+}
+
+/**
+ * Makes the dialog visible and brings it to the front
+ * of the display.
+ *
+ * @return a FontData object describing the font that was selected,
+ *         or null if the dialog was cancelled or an error occurred
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the dialog has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the dialog</li>
+ * </ul>
+ */
+public FontData open () {
+	int handle;
+	byte [] titleBytes;
+	titleBytes = Converter.wcsToMbcs (null, title, true);
+	handle = OS.gtk_font_selection_dialog_new (titleBytes);
+	if (parent!=null) {
+		OS.gtk_window_set_transient_for(handle, parent.topHandle());
+	}
+	if (fontData != null) {
+		Display display = parent != null ? parent.getDisplay () : Display.getCurrent ();
+		Font font = new Font (display, fontData);
+		int fontName = OS.pango_font_description_to_string (font.handle);
+		int length = OS.strlen (fontName);
+		byte [] buffer = new byte [length + 1];
+		OS.memmove (buffer, fontName, length);
+		font.dispose();
+		OS.g_free (fontName);
+		OS.gtk_font_selection_dialog_set_font_name (handle, buffer);
+	}
+	int response = OS.gtk_dialog_run(handle);
+	boolean success = response == OS.GTK_RESPONSE_OK; 
+	if (success) {
+		int fontName = OS.gtk_font_selection_dialog_get_font_name (handle);
+		int length = OS.strlen (fontName);
+		byte [] buffer = new byte [length + 1];
+		OS.memmove (buffer, fontName, length);
+		int fontDesc = OS.pango_font_description_from_string (buffer);
+		Display display = parent != null ? parent.getDisplay () : Display.getCurrent ();
+		Font font = Font.gtk_new (display, fontDesc);
+		fontData = font.getFontData () [0];
+		OS.pango_font_description_free (fontDesc);		
+	}
+	OS.gtk_widget_destroy(handle);
+	if (!success) return null;
+	return fontData;
+}
+/**
+ * Sets a FontData object describing the font to be
+ * selected by default in the dialog, or null to let
+ * the platform choose one.
+ * 
+ * @param fontData the FontData to use initially, or null
+ */
+public void setFontData (FontData fontData) {
+	this.fontData = fontData;
+}
+/**
+ * Returns the receiver's selected color to be the argument.
+ *
+ * @param rgb the new RGB value for the selected color, may be
+ *        null to let the platform to select a default when
+ *        open() is called
+ *
+ * @see PaletteData#getRGBs
+ */
+public void setRGB (RGB rgb) {
+	this.rgb = rgb;
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
index cabe9e2c07..84da604f97 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
@@ -12,61 +12,61 @@ import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
-/**

- * Instances of this class provide an etched border

- * with an optional title.

- * <p>

- * Shadow styles are hints and may not be honoured

- * by the platform.  To create a group with the

- * default shadow style for the platform, do not

- * specify a shadow style.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>SHADOW_ETCHED_IN, SHADOW_ETCHED_OUT, SHADOW_IN, SHADOW_OUT, SHADOW_NONE</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * Note: Only one of the above styles may be specified.

- * </p><p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

+/**
+ * Instances of this class provide an etched border
+ * with an optional title.
+ * <p>
+ * Shadow styles are hints and may not be honoured
+ * by the platform.  To create a group with the
+ * default shadow style for the platform, do not
+ * specify a shadow style.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>SHADOW_ETCHED_IN, SHADOW_ETCHED_OUT, SHADOW_IN, SHADOW_OUT, SHADOW_NONE</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * Note: Only one of the above styles may be specified.
+ * </p><p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
  */
 public class Group extends Composite {
 	int clientHandle, labelHandle;
 	String text = "";
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#SHADOW_ETCHED_IN

- * @see SWT#SHADOW_ETCHED_OUT

- * @see SWT#SHADOW_IN

- * @see SWT#SHADOW_OUT

- * @see SWT#SHADOW_NONE

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#SHADOW_ETCHED_IN
+ * @see SWT#SHADOW_ETCHED_OUT
+ * @see SWT#SHADOW_IN
+ * @see SWT#SHADOW_OUT
+ * @see SWT#SHADOW_NONE
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Group (Composite parent, int style) {
 	super (parent, checkStyle (style));
@@ -212,17 +212,17 @@ String getNameText () {
 	return getText ();
 }
 
-/**

- * Returns the receiver's text, which is the string that the

- * is used as the <em>title</em>. If the text has not previously

- * been set, returns an empty string.

- *

- * @return the text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's text, which is the string that the
+ * is used as the <em>title</em>. If the text has not previously
+ * been set, returns an empty string.
+ *
+ * @return the text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public String getText () {
 	checkWidget();
@@ -264,20 +264,20 @@ void setForegroundColor (GdkColor color) {
 	OS.gtk_widget_modify_fg (labelHandle, 0, color);
 }
 
-/**

- * Sets the receiver's text, which is the string that will

- * be displayed as the receiver's <em>title</em>, to the argument,

- * which may not be null. 

- *

- * @param text the new text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's text, which is the string that will
+ * be displayed as the receiver's <em>title</em>, to the argument,
+ * which may not be null. 
+ *
+ * @param text the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setText (String string) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
index e530851422..6feb04783e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
@@ -12,69 +12,69 @@ import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 
-/**

- * Instances of this class represent a non-selectable

- * user interface object that displays a string or image.

- * When SEPARATOR is specified, displays a single

- * vertical or horizontal line.

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>SEPARATOR, HORIZONTAL, VERTICAL</dd>

- * <dd>SHADOW_IN, SHADOW_OUT, SHADOW_NONE</dd>

- * <dd>CENTER, LEFT, RIGHT, WRAP</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * Note: Only one of SHADOW_IN, SHADOW_OUT and SHADOW_NONE may be specified.

- * SHADOW_NONE is a HINT. Only one of HORIZONTAL and VERTICAL may be specified.

- * Only one of CENTER, LEFT and RIGHT may be specified.

- * </p><p>

- * IMPORTANT: This class is intended to be subclassed <em>only</em>

- * within the SWT implementation.

- * </p>

+/**
+ * Instances of this class represent a non-selectable
+ * user interface object that displays a string or image.
+ * When SEPARATOR is specified, displays a single
+ * vertical or horizontal line.
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>SEPARATOR, HORIZONTAL, VERTICAL</dd>
+ * <dd>SHADOW_IN, SHADOW_OUT, SHADOW_NONE</dd>
+ * <dd>CENTER, LEFT, RIGHT, WRAP</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * Note: Only one of SHADOW_IN, SHADOW_OUT and SHADOW_NONE may be specified.
+ * SHADOW_NONE is a HINT. Only one of HORIZONTAL and VERTICAL may be specified.
+ * Only one of CENTER, LEFT and RIGHT may be specified.
+ * </p><p>
+ * IMPORTANT: This class is intended to be subclassed <em>only</em>
+ * within the SWT implementation.
+ * </p>
  */
 public class Label extends Control {
 	int frameHandle, labelHandle, imageHandle;
 	Image image;
 	String text;
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#SEPARATOR

- * @see SWT#HORIZONTAL

- * @see SWT#VERTICAL

- * @see SWT#SHADOW_IN

- * @see SWT#SHADOW_OUT

- * @see SWT#SHADOW_NONE

- * @see SWT#CENTER

- * @see SWT#LEFT

- * @see SWT#RIGHT

- * @see SWT#WRAP

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#SEPARATOR
+ * @see SWT#HORIZONTAL
+ * @see SWT#VERTICAL
+ * @see SWT#SHADOW_IN
+ * @see SWT#SHADOW_OUT
+ * @see SWT#SHADOW_NONE
+ * @see SWT#CENTER
+ * @see SWT#LEFT
+ * @see SWT#RIGHT
+ * @see SWT#WRAP
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public Label (Composite parent, int style) {
 	super (parent, checkStyle (style));
@@ -198,19 +198,19 @@ int eventHandle () {
 	return fixedHandle;
 }
 
-/**

- * Returns a value which describes the position of the

- * text or image in the receiver. The value will be one of

- * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>

- * unless the receiver is a <code>SEPARATOR</code> label, in 

- * which case, <code>NONE</code> is returned.

- *

- * @return the alignment 

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns a value which describes the position of the
+ * text or image in the receiver. The value will be one of
+ * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>
+ * unless the receiver is a <code>SEPARATOR</code> label, in 
+ * which case, <code>NONE</code> is returned.
+ *
+ * @return the alignment 
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getAlignment () {
 	checkWidget ();
@@ -221,16 +221,16 @@ public int getAlignment () {
 	return SWT.LEFT;
 }
 
-/**

- * Returns the receiver's image if it has one, or null

- * if it does not.

- *

- * @return the receiver's image

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's image if it has one, or null
+ * if it does not.
+ *
+ * @return the receiver's image
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public Image getImage () {
 	checkWidget ();
@@ -241,17 +241,17 @@ String getNameText () {
 	return getText ();
 }
 
-/**

- * Returns the receiver's text, which will be an empty

- * string if it has never been set or if the receiver is

- * a <code>SEPARATOR</code> label.

- *

- * @return the receiver's text

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the receiver's text, which will be an empty
+ * string if it has never been set or if the receiver is
+ * a <code>SEPARATOR</code> label.
+ *
+ * @return the receiver's text
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public String getText () {
 	checkWidget ();
@@ -326,18 +326,18 @@ void resizeHandle (int width, int height) {
 	OS.gtk_widget_size_request (widgetHandle, requisition);
 }
 
-/**

- * Controls how text and images will be displayed in the receiver.

- * The argument should be one of <code>LEFT</code>, <code>RIGHT</code>

- * or <code>CENTER</code>.  If the receiver is a <code>SEPARATOR</code>

- * label, the argument is ignored and the alignment is not changed.

- *

- * @param alignment the new alignment 

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Controls how text and images will be displayed in the receiver.
+ * The argument should be one of <code>LEFT</code>, <code>RIGHT</code>
+ * or <code>CENTER</code>.  If the receiver is a <code>SEPARATOR</code>
+ * label, the argument is ignored and the alignment is not changed.
+ *
+ * @param alignment the new alignment 
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setAlignment (int alignment) {
 	checkWidget ();
@@ -420,19 +420,19 @@ void setForegroundColor (GdkColor color) {
 	if (imageHandle != 0) OS.gtk_widget_modify_fg (imageHandle, 0, color);
 }
 
-/**

- * Sets the receiver's image to the argument, which may be

- * null indicating that no image should be displayed.

- *

- * @param image the image to display on the receiver (may be null)

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li> 

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's image to the argument, which may be
+ * null indicating that no image should be displayed.
+ *
+ * @param image the image to display on the receiver (may be null)
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li> 
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setImage (Image image) {
 	checkWidget ();
@@ -449,22 +449,22 @@ public void setImage (Image image) {
 	}
 }
 
-/**

- * Sets the receiver's text.

- * <p>

- * This method sets the widget label.  The label may include

- * the mnemonic characters and line delimiters.

- * </p>

- * 

- * @param string the new text

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the receiver's text.
+ * <p>
+ * This method sets the widget label.  The label may include
+ * the mnemonic characters and line delimiters.
+ * </p>
+ * 
+ * @param string the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setText (String string) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index 2ce6f11dfb..a307fa4beb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -13,76 +13,76 @@ import org.eclipse.swt.internal.gtk.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.events.*;
 
-/** 

- * Instances of this class represent a selectable user interface

- * object that displays a list of strings and issues notificiation

- * when a string selected.  A list may be single or multi select.

- * <p>

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>SINGLE, MULTI</dd>

- * <dt><b>Events:</b></dt>

- * <dd>Selection, DefaultSelection</dd>

- * </dl>

- * <p>

- * Note: Only one of SINGLE and MULTI may be specified.

- * </p><p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

+/** 
+ * Instances of this class represent a selectable user interface
+ * object that displays a list of strings and issues notificiation
+ * when a string selected.  A list may be single or multi select.
+ * <p>
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>SINGLE, MULTI</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Selection, DefaultSelection</dd>
+ * </dl>
+ * <p>
+ * Note: Only one of SINGLE and MULTI may be specified.
+ * </p><p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
  */
 public class List extends Scrollable {
 	int modelHandle;
 
-/**

- * Constructs a new instance of this class given its parent

- * and a style value describing its behavior and appearance.

- * <p>

- * The style value is either one of the style constants defined in

- * class <code>SWT</code> which is applicable to instances of this

- * class, or must be built by <em>bitwise OR</em>'ing together 

- * (that is, using the <code>int</code> "|" operator) two or more

- * of those <code>SWT</code> style constants. The class description

- * lists the style constants that are applicable to the class.

- * Style bits are also inherited from superclasses.

- * </p>

- *

- * @param parent a composite control which will be the parent of the new instance (cannot be null)

- * @param style the style of control to construct

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>

- *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>

- * </ul>

- *

- * @see SWT#SINGLE

- * @see SWT#MULTI

- * @see Widget#checkSubclass

- * @see Widget#getStyle

+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ * <p>
+ * The style value is either one of the style constants defined in
+ * class <code>SWT</code> which is applicable to instances of this
+ * class, or must be built by <em>bitwise OR</em>'ing together 
+ * (that is, using the <code>int</code> "|" operator) two or more
+ * of those <code>SWT</code> style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ * </p>
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ *
+ * @see SWT#SINGLE
+ * @see SWT#MULTI
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
  */
 public List (Composite parent, int style) {
 	super (parent, checkStyle (style));
 }
 
-/**

- * Adds the argument to the end of the receiver's list.

- *

- * @param string the new item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

- *

- * @see #add(String,int)

+/**
+ * Adds the argument to the end of the receiver's list.
+ *
+ * @param string the new item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ * @see #add(String,int)
  */
 public void add (String string) {
 	checkWidget();
@@ -95,31 +95,31 @@ public void add (String string) {
 	OS.g_free (iter);
 }
 
-/**

- * Adds the argument to the receiver's list at the given

- * zero-relative index.

- * <p>

- * Note: To add an item at the end of the list, use the

- * result of calling <code>getItemCount()</code> as the

- * index or use <code>add(String)</code>.

- * </p>

- *

- * @param string the new item

- * @param index the index for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

- *

- * @see #add(String)

+/**
+ * Adds the argument to the receiver's list at the given
+ * zero-relative index.
+ * <p>
+ * Note: To add an item at the end of the list, use the
+ * result of calling <code>getItemCount()</code> as the
+ * index or use <code>add(String)</code>.
+ * </p>
+ *
+ * @param string the new item
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ * @see #add(String)
  */
 public void add (String string, int index) {
 	checkWidget();
@@ -135,29 +135,29 @@ public void add (String string, int index) {
 	OS.g_free (iter);
 }
 
-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the receiver's selection changes, by sending

- * it one of the messages defined in the <code>SelectionListener</code>

- * interface.

- * <p>

- * <code>widgetSelected</code> is called when the selection changes.

- * <code>widgetDefaultSelected</code> is typically called when an item is double-clicked.

- * </p>

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #removeSelectionListener

- * @see SelectionEvent

+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's selection changes, by sending
+ * it one of the messages defined in the <code>SelectionListener</code>
+ * interface.
+ * <p>
+ * <code>widgetSelected</code> is called when the selection changes.
+ * <code>widgetDefaultSelected</code> is typically called when an item is double-clicked.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
  */
 public void addSelectionListener(SelectionListener listener) {
 	checkWidget();
@@ -236,17 +236,17 @@ void deregister() {
 	WidgetTable.remove (OS.gtk_tree_view_get_selection (handle));
 }
 
-/**

- * Deselects the item at the given zero-relative index in the receiver.

- * If the item at the index was already deselected, it remains

- * deselected. Indices that are out of range are ignored.

- *

- * @param index the index of the item to deselect

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Deselects the item at the given zero-relative index in the receiver.
+ * If the item at the index was already deselected, it remains
+ * deselected. Indices that are out of range are ignored.
+ *
+ * @param index the index of the item to deselect
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void deselect (int index) {
 	checkWidget();
@@ -260,20 +260,20 @@ public void deselect (int index) {
 	OS.g_free (iter);
 }
 
-/**

- * Deselects the items at the given zero-relative indices in the receiver.

- * If the item at the given zero-relative index in the receiver 

- * is selected, it is deselected.  If the item at the index

- * was not selected, it remains deselected.  The range of the

- * indices is inclusive. Indices that are out of range are ignored.

- *

- * @param start the start index of the items to deselect

- * @param end the end index of the items to deselect

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Deselects the items at the given zero-relative indices in the receiver.
+ * If the item at the given zero-relative index in the receiver 
+ * is selected, it is deselected.  If the item at the index
+ * was not selected, it remains deselected.  The range of the
+ * indices is inclusive. Indices that are out of range are ignored.
+ *
+ * @param start the start index of the items to deselect
+ * @param end the end index of the items to deselect
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void deselect (int start, int end) {
 	checkWidget();
@@ -293,22 +293,22 @@ public void deselect (int start, int end) {
 	OS.g_free (iter);
 }
 
-/**

- * Deselects the items at the given zero-relative indices in the receiver.

- * If the item at the given zero-relative index in the receiver 

- * is selected, it is deselected.  If the item at the index

- * was not selected, it remains deselected. Indices that are out

- * of range and duplicate indices are ignored.

- *

- * @param indices the array of indices for the items to deselect

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Deselects the items at the given zero-relative indices in the receiver.
+ * If the item at the given zero-relative index in the receiver 
+ * is selected, it is deselected.  If the item at the index
+ * was not selected, it remains deselected. Indices that are out
+ * of range and duplicate indices are ignored.
+ *
+ * @param indices the array of indices for the items to deselect
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void deselect (int [] indices) {
 	checkWidget();
@@ -327,13 +327,13 @@ public void deselect (int [] indices) {
 	OS.g_free (iter);
 }
 
-/**

- * Deselects all selected items in the receiver.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Deselects all selected items in the receiver.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void deselectAll () {
 	checkWidget();
@@ -347,16 +347,16 @@ GdkColor getBackgroundColor () {
 	return getBaseColor ();
 }
 
-/**

- * Returns the zero-relative index of the item which is currently

- * has the focus in the receiver, or -1 if no item is has focus.

- *

- * @return the index of the selected item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the zero-relative index of the item which is currently
+ * has the focus in the receiver, or -1 if no item is has focus.
+ *
+ * @return the index of the selected item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getFocusIndex () {
 	checkWidget();
@@ -374,23 +374,23 @@ GdkColor getForegroundColor () {
 	return getTextColor ();
 }
 
-/**

- * Returns the item at the given, zero-relative index in the

- * receiver. Throws an exception if the index is out of range.

- *

- * @param index the index of the item to return

- * @return the item at the given index

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the item at the given, zero-relative index in the
+ * receiver. Throws an exception if the index is out of range.
+ *
+ * @param index the index of the item to return
+ * @return the item at the given index
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public String getItem (int index) {
 	checkWidget();
@@ -410,37 +410,37 @@ public String getItem (int index) {
 	return new String (Converter.mbcsToWcs (null, buffer2));
 }
 
-/**

- * Returns the number of items contained in the receiver.

- *

- * @return the number of items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the number of items contained in the receiver.
+ *
+ * @return the number of items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getItemCount () {
 	checkWidget();
 	return OS.gtk_tree_model_iter_n_children (modelHandle, 0);
 }
 
-/**

- * Returns the height of the area which would be used to

- * display <em>one</em> of the items in the tree.

- *

- * @return the height of one item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the height of the area which would be used to
+ * display <em>one</em> of the items in the tree.
+ *
+ * @return the height of one item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM_HEIGHT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getItemHeight () {
 	checkWidget();
@@ -453,25 +453,25 @@ public int getItemHeight () {
 	return h [0];
 }
 
-/**

- * Returns an array of <code>String</code>s which are the items

- * in the receiver. 

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its list of items, so modifying the array will

- * not affect the receiver. 

- * </p>

- *

- * @return the items in the receiver's list

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>

- *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure while getting the item count</li>

- * </ul>

+/**
+ * Returns an array of <code>String</code>s which are the items
+ * in the receiver. 
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its list of items, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ *
+ * @return the items in the receiver's list
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure while getting the item count</li>
+ * </ul>
  */
 public String [] getItems () {
 	checkWidget();
@@ -494,25 +494,25 @@ public String [] getItems () {
 	return result;
 }
 
-/**

- * Returns an array of <code>String</code>s that are currently

- * selected in the receiver. An empty array indicates that no

- * items are selected.

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its selection, so modifying the array will

- * not affect the receiver. 

- * </p>

- * @return an array representing the selection

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure while getting the selection</li>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>

- * </ul>

+/**
+ * Returns an array of <code>String</code>s that are currently
+ * selected in the receiver. An empty array indicates that no
+ * items are selected.
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its selection, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ * @return an array representing the selection
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure while getting the selection</li>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>
+ * </ul>
  */
 public String [] getSelection () {
 	checkWidget();
@@ -524,18 +524,18 @@ public String [] getSelection () {
 	return result;
 }
 
-/**

- * Returns the number of selected items contained in the receiver.

- *

- * @return the number of selected items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the number of selected items contained in the receiver.
+ *
+ * @return the number of selected items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getSelectionCount () {
 	checkWidget();
@@ -547,19 +547,19 @@ public int getSelectionCount () {
 	return display.treeSelectionLength;
 }
 
-/**

- * Returns the zero-relative index of the item which is currently

- * selected in the receiver, or -1 if no item is selected.

- *

- * @return the index of the selected item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the zero-relative index of the item which is currently
+ * selected in the receiver, or -1 if no item is selected.
+ *
+ * @return the index of the selected item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int getSelectionIndex () {
 	checkWidget();
@@ -573,23 +573,23 @@ public int getSelectionIndex () {
 	return display.treeSelection [0];
 }
 
-/**

- * Returns the zero-relative indices of the items which are currently

- * selected in the receiver.  The array is empty if no items are selected.

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its selection, so modifying the array will

- * not affect the receiver. 

- * </p>

- * @return the array of indices of the selected items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Returns the zero-relative indices of the items which are currently
+ * selected in the receiver.  The array is empty if no items are selected.
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its selection, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ * @return the array of indices of the selected items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_SELECTION - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public int [] getSelectionIndices () {
 	checkWidget();
@@ -605,17 +605,17 @@ public int [] getSelectionIndices () {
 	return result;
 }
 
-/**

- * Returns the zero-relative index of the item which is currently

- * at the top of the receiver. This index can change when items are

- * scrolled or new items are added or removed.

- *

- * @return the index of the top item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns the zero-relative index of the item which is currently
+ * at the top of the receiver. This index can change when items are
+ * scrolled or new items are added or removed.
+ *
+ * @return the index of the top item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int getTopIndex () {
 	checkWidget();
@@ -699,51 +699,51 @@ void hookEvents () {
 	OS.g_signal_connect (handle, OS.row_activated, display.windowProc4, ROW_ACTIVATED);
 }
 
-/**

- * Gets the index of an item.

- * <p>

- * The list is searched starting at 0 until an

- * item is found that is equal to the search item.

- * If no item is found, -1 is returned.  Indexing

- * is zero based.

- *

- * @param string the search item

- * @return the index of the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Gets the index of an item.
+ * <p>
+ * The list is searched starting at 0 until an
+ * item is found that is equal to the search item.
+ * If no item is found, -1 is returned.  Indexing
+ * is zero based.
+ *
+ * @param string the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public int indexOf (String string) {
 	checkWidget();
 	return indexOf (string, 0);
 }
 
-/**

- * Searches the receiver's list starting at the given, 

- * zero-relative index until an item is found that is equal

- * to the argument, and returns the index of that item. If

- * no item is found or the starting index is out of range,

- * returns -1.

- *

- * @param string the search item

- * @return the index of the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure while getting the item count</li>

- *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>

- * </ul>

+/**
+ * Searches the receiver's list starting at the given, 
+ * zero-relative index until an item is found that is equal
+ * to the argument, and returns the index of that item. If
+ * no item is found or the starting index is out of range,
+ * returns -1.
+ *
+ * @param string the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure while getting the item count</li>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure while getting an item</li>
+ * </ul>
  */
 public int indexOf (String string, int start) {
 	checkWidget();
@@ -755,18 +755,18 @@ public int indexOf (String string, int start) {
 	return -1;
 }
 
-/**

- * Returns <code>true</code> if the item is selected,

- * and <code>false</code> otherwise.  Indices out of

- * range are ignored.

- *

- * @param index the index of the item

- * @return the visibility state of the item at the index

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Returns <code>true</code> if the item is selected,
+ * and <code>false</code> otherwise.  Indices out of
+ * range are ignored.
+ *
+ * @param index the index of the item
+ * @return the visibility state of the item at the index
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public boolean isSelected (int index) {
 	checkWidget();
@@ -794,22 +794,22 @@ void releaseWidget () {
 	modelHandle = 0;
 }
 
-/**

- * Removes the item from the receiver at the given

- * zero-relative index.

- *

- * @param index the index for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Removes the item from the receiver at the given
+ * zero-relative index.
+ *
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (int index) {
 	checkWidget();
@@ -825,24 +825,24 @@ public void remove (int index) {
 	OS.g_free (iter);
 }
 
-/**

- * Removes the items from the receiver which are

- * between the given zero-relative start and end 

- * indices (inclusive).

- *

- * @param start the start of the range

- * @param end the end of the range

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Removes the items from the receiver which are
+ * between the given zero-relative start and end 
+ * indices (inclusive).
+ *
+ * @param start the start of the range
+ * @param end the end of the range
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (int start, int end) {
 	checkWidget();
@@ -851,7 +851,7 @@ public void remove (int start, int end) {
 	int count =  OS.gtk_tree_model_iter_n_children (modelHandle, 0);
 	int iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
 	int selection = OS.gtk_tree_view_get_selection (handle);
-	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);

+	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=Math.min(end,count-1); index>=start; index--) {
 		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 		OS.gtk_list_store_remove (modelHandle, iter);
@@ -863,24 +863,24 @@ public void remove (int start, int end) {
 	}
 }
 
-/**

- * Searches the receiver's list starting at the first item

- * until an item is found that is equal to the argument, 

- * and removes that item from the list.

- *

- * @param string the item to remove

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>

- *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Searches the receiver's list starting at the first item
+ * until an item is found that is equal to the argument, 
+ * and removes that item from the list.
+ *
+ * @param string the item to remove
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (String string) {
 	checkWidget();
@@ -889,22 +889,22 @@ public void remove (String string) {
 	remove (index);
 }
 
-/**

- * Removes the items from the receiver at the given

- * zero-relative indices.

- *

- * @param indices the array of indices of the items

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Removes the items from the receiver at the given
+ * zero-relative indices.
+ *
+ * @param indices the array of indices of the items
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void remove (int [] indices) {
 	checkWidget();
@@ -935,13 +935,13 @@ public void remove (int [] indices) {
 	OS.g_free (iter);
 }
 
-/**

- * Removes all of the items from the receiver.

- * <p>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Removes all of the items from the receiver.
+ * <p>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void removeAll () {
 	checkWidget();
@@ -951,22 +951,22 @@ public void removeAll () {
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the receiver's selection changes.

- *

- * @param listener the listener which should no longer be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #addSelectionListener

+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the receiver's selection changes.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #addSelectionListener
  */
 public void removeSelectionListener(SelectionListener listener) {
 	checkWidget();
@@ -976,17 +976,17 @@ public void removeSelectionListener(SelectionListener listener) {
 	eventTable.unhook (SWT.DefaultSelection,listener);	
 }
 
-/**

- * Selects the item at the given zero-relative index in the receiver's 

- * list.  If the item at the index was already selected, it remains

- * selected. Indices that are out of range are ignored.

- *

- * @param index the index of the item to select

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Selects the item at the given zero-relative index in the receiver's 
+ * list.  If the item at the index was already selected, it remains
+ * selected. Indices that are out of range are ignored.
+ *
+ * @param index the index of the item to select
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void select (int index) {
 	checkWidget();
@@ -1006,19 +1006,19 @@ public void select (int index) {
 	OS.g_free (iter);
 }
 
-/**

- * Selects the items at the given zero-relative indices in the receiver.

- * If the item at the index was already selected, it remains

- * selected. The range of the indices is inclusive. Indices that are

- * out of range are ignored.

- *

- * @param start the start of the range

- * @param end the end of the range

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Selects the items at the given zero-relative indices in the receiver.
+ * If the item at the index was already selected, it remains
+ * selected. The range of the indices is inclusive. Indices that are
+ * out of range are ignored.
+ *
+ * @param start the start of the range
+ * @param end the end of the range
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void select (int start, int end) {
 	checkWidget();
@@ -1044,22 +1044,22 @@ public void select (int start, int end) {
 	OS.g_free (iter);
 }
 
-/**

- * Selects the items at the given zero-relative indices in the receiver.

- * If the item at the given zero-relative index in the receiver 

- * is not selected, it is selected.  If the item at the index

- * was selected, it remains selected. Indices that are out

- * of range and duplicate indices are ignored.

- *

- * @param indices the array of indices for the items to select

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Selects the items at the given zero-relative indices in the receiver.
+ * If the item at the given zero-relative index in the receiver 
+ * is not selected, it is selected.  If the item at the index
+ * was selected, it remains selected. Indices that are out
+ * of range and duplicate indices are ignored.
+ *
+ * @param indices the array of indices for the items to select
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void select (int [] indices) {
 	checkWidget();
@@ -1085,13 +1085,13 @@ public void select (int [] indices) {
 	OS.g_free (iter);
 }
 
-/**

- * Selects all the items in the receiver.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Selects all the items in the receiver.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void selectAll () {
 	checkWidget();
@@ -1126,26 +1126,26 @@ void setForegroundColor (GdkColor color) {
 	OS.gtk_widget_modify_text (handle, 0, color);
 }
 
-/**

- * Sets the text of the item in the receiver's list at the given

- * zero-relative index to the string argument. This is equivalent

- * to <code>remove</code>'ing the old item at the index, and then

- * <code>add</code>'ing the new item at that index.

- *

- * @param index the index for the item

- * @param string the new text for the item

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_REMOVED - if the remove operation fails because of an operating system failure</li>

- *    <li>ERROR_ITEM_NOT_ADDED - if the add operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Sets the text of the item in the receiver's list at the given
+ * zero-relative index to the string argument. This is equivalent
+ * to <code>remove</code>'ing the old item at the index, and then
+ * <code>add</code>'ing the new item at that index.
+ *
+ * @param index the index for the item
+ * @param string the new text for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the remove operation fails because of an operating system failure</li>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the add operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void setItem (int index, String string) {
 	checkWidget();
@@ -1160,18 +1160,18 @@ public void setItem (int index, String string) {
 	OS.g_free (iter);
 }
 
-/**

- * Sets the receiver's items to be the given array of items.

- *

- * @param items the array of items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @exception SWTError <ul>

- *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>

- * </ul>

+/**
+ * Sets the receiver's items to be the given array of items.
+ *
+ * @param items the array of items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
  */
 public void setItems (String [] items) {
 	checkWidget();
@@ -1195,20 +1195,20 @@ public void setItems (String [] items) {
 	OS.g_free (iter);
 }
 
-/**

- * Selects the item at the given zero-relative index in the receiver. 

- * If the item at the index was already selected, it remains selected.

- * The current selected is first cleared, then the new items are selected.

- * Indices that are out of range are ignored.

- *

- * @param index the index of the item to select

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * @see List#deselectAll()

- * @see List#select(int)

+/**
+ * Selects the item at the given zero-relative index in the receiver. 
+ * If the item at the index was already selected, it remains selected.
+ * The current selected is first cleared, then the new items are selected.
+ * Indices that are out of range are ignored.
+ *
+ * @param index the index of the item to select
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @see List#deselectAll()
+ * @see List#select(int)
  */
 public void setSelection (int index) {
 	checkWidget();
@@ -1217,20 +1217,20 @@ public void setSelection (int index) {
 	showSelection ();
 }
 
-/**

- * Selects the items at the given zero-relative indices in the receiver. 

- * The current selected if first cleared, then the new items are selected.

- *

- * @param start the start index of the items to select

- * @param end the end index of the items to select

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see Table#deselectAll()

- * @see Table#select(int,int)

+/**
+ * Selects the items at the given zero-relative indices in the receiver. 
+ * The current selected if first cleared, then the new items are selected.
+ *
+ * @param start the start index of the items to select
+ * @param end the end index of the items to select
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see Table#deselectAll()
+ * @see Table#select(int,int)
  */
 public void setSelection (int start, int end) {
 	checkWidget();
@@ -1239,22 +1239,22 @@ public void setSelection (int start, int end) {
 	showSelection ();
 }
 
-/**

- * Selects the items at the given zero-relative indices in the receiver. 

- * The current selection is first cleared, then the new items are selected.

- *

- * @param indices the indices of the items to select

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see List#deselectAll()

- * @see List#select(int[])

+/**
+ * Selects the items at the given zero-relative indices in the receiver. 
+ * The current selection is first cleared, then the new items are selected.
+ *
+ * @param indices the indices of the items to select
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see List#deselectAll()
+ * @see List#select(int[])
  */
 public void setSelection(int[] indices) {
 	checkWidget();
@@ -1264,23 +1264,23 @@ public void setSelection(int[] indices) {
 	showSelection ();
 }
 
-/**

- * Sets the receiver's selection to be the given array of items.

- * The current selected is first cleared, then the new items are

- * selected.

- *

- * @param items the array of items

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see List#deselectAll()

- * @see List#select(int)

+/**
+ * Sets the receiver's selection to be the given array of items.
+ * The current selected is first cleared, then the new items are
+ * selected.
+ *
+ * @param items the array of items
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see List#deselectAll()
+ * @see List#select(int)
  */
 public void setSelection (String [] items) {
 	checkWidget();
@@ -1304,17 +1304,17 @@ public void setSelection (String [] items) {
 	showSelection ();
 }
 
-/**

- * Sets the zero-relative index of the item which is currently

- * at the top of the receiver. This index can change when items

- * are scrolled or new items are added and removed.

- *

- * @param index the index of the top item

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Sets the zero-relative index of the item which is currently
+ * at the top of the receiver. This index can change when items
+ * are scrolled or new items are added and removed.
+ *
+ * @param index the index of the top item
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void setTopIndex (int index) {
 	checkWidget();
@@ -1328,18 +1328,18 @@ public void setTopIndex (int index) {
 	OS.g_free (iter);
 }
 
-/**

- * Shows the selection.  If the selection is already showing in the receiver,

- * this method simply returns.  Otherwise, the items are scrolled until

- * the selection is visible.

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+/**
+ * Shows the selection.  If the selection is already showing in the receiver,
+ * this method simply returns.  Otherwise, the items are scrolled until
+ * the selection is visible.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
 public void showSelection () {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
index fab7f3a7db..357ea3c399 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
@@ -1,18 +1,18 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+
 /**
  * Instances of this class are user interface objects that contain
  * menu items.
@@ -28,13 +28,13 @@ import org.eclipse.swt.graphics.*;
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
  */
-public class Menu extends Widget {

-	int x, y;

-	boolean hasLocation;

-	MenuItem cascade, selectedItem;

-	Decorations parent;

-	int imItem, imSeparator, imHandle;

-

+public class Menu extends Widget {
+	int x, y;
+	boolean hasLocation;
+	MenuItem cascade, selectedItem;
+	Decorations parent;
+	int imItem, imSeparator, imHandle;
+
 /**
  * Constructs a new instance of this class given its parent,
  * and sets the style for the instance so that the instance
@@ -54,10 +54,10 @@ public class Menu extends Widget {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public Menu (Control parent) {

-	this (parent.getShell (), SWT.POP_UP);

-}

-

+public Menu (Control parent) {
+	this (parent.getShell (), SWT.POP_UP);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Decorations</code>) and a style value
@@ -89,12 +89,12 @@ public Menu (Control parent) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public Menu (Decorations parent, int style) {

-	super (parent, checkStyle (style));

-	this.parent = parent;

-	createWidget (0);

-}

-

+public Menu (Decorations parent, int style) {
+	super (parent, checkStyle (style));
+	this.parent = parent;
+	createWidget (0);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Menu</code>) and sets the style
@@ -115,10 +115,10 @@ public Menu (Decorations parent, int style) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public Menu (Menu parentMenu) {

-	this (parentMenu.parent, SWT.DROP_DOWN);

-}

-

+public Menu (Menu parentMenu) {
+	this (parentMenu.parent, SWT.DROP_DOWN);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>MenuItem</code>) and sets the style
@@ -139,22 +139,22 @@ public Menu (Menu parentMenu) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public Menu (MenuItem parentItem) {

-	this (parentItem.parent);

-}

-

-static int checkStyle (int style) {

-	return checkBits (style, SWT.POP_UP, SWT.BAR, SWT.DROP_DOWN, 0, 0, 0);

-}

-

-void addAccelerators (int accelGroup) {

-	MenuItem [] items = getItems ();

+public Menu (MenuItem parentItem) {
+	this (parentItem.parent);
+}
+
+static int checkStyle (int style) {
+	return checkBits (style, SWT.POP_UP, SWT.BAR, SWT.DROP_DOWN, 0, 0, 0);
+}
+
+void addAccelerators (int accelGroup) {
+	MenuItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
 		MenuItem item = items[i];
 		item.addAccelerators (accelGroup);
-	}

-}

-

+	}
+}
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when menus are hidden or shown, by sending it
@@ -174,14 +174,14 @@ void addAccelerators (int accelGroup) {
  * @see MenuListener
  * @see #removeMenuListener
  */
-public void addMenuListener (MenuListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener (listener);

-	addListener (SWT.Hide,typedListener);

-	addListener (SWT.Show,typedListener);

-}

-

+public void addMenuListener (MenuListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Hide,typedListener);
+	addListener (SWT.Show,typedListener);
+}
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when help events are generated for the control,
@@ -201,62 +201,62 @@ public void addMenuListener (MenuListener listener) {
  * @see HelpListener
  * @see #removeHelpListener
  */
-public void addHelpListener (HelpListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener (listener);

-	addListener (SWT.Help, typedListener);

-}

-

-void createHandle (int index) {

-	state |= HANDLE;

-	if ((style & SWT.BAR) != 0) {

-		handle = OS.gtk_menu_bar_new ();

-		if (handle == 0) error (SWT.ERROR_NO_HANDLES);

-		int parentHandle = parent.fixedHandle;

-		OS.gtk_container_add (parentHandle, handle);

-	} else {

-		handle = OS.gtk_menu_new ();

-		if (handle == 0) error (SWT.ERROR_NO_HANDLES);

-	}

-}

-

-void createIMMenu (int imHandle) {

-	if (this.imHandle == imHandle) return;

-	this.imHandle = imHandle;

-	if (imHandle == 0) {

-		if (imItem != 0) {

-			OS.gtk_widget_destroy (imItem);

-			imItem = 0;

-		}

-		if (imSeparator != 0) {

-			OS.gtk_widget_destroy (imSeparator);

-			imSeparator = 0;

-		}

-		return;

-	} 

-	if (imSeparator == 0) {

-		imSeparator = OS.gtk_separator_menu_item_new ();

-		OS.gtk_widget_show (imSeparator);

-		OS.gtk_menu_shell_insert (handle, imSeparator, -1);

-	}

-	if (imItem == 0) {

-		byte[] buffer = Converter.wcsToMbcs (null, SWT.getMessage("SWT_InputMethods"), true);

-		imItem = OS.gtk_image_menu_item_new_with_label (buffer);

-		OS.gtk_widget_show (imItem);

-		OS.gtk_menu_shell_insert (handle, imItem, -1);

-	}

-	int imSubmenu = OS.gtk_menu_new ();

-	OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);

-	OS.gtk_menu_item_set_submenu (imItem, imSubmenu);

-}

-

-void createWidget (int index) {

-	checkOrientation (parent);

-	super.createWidget (index);

-	parent.add (this);

-}

-

+public void addHelpListener (HelpListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Help, typedListener);
+}
+
+void createHandle (int index) {
+	state |= HANDLE;
+	if ((style & SWT.BAR) != 0) {
+		handle = OS.gtk_menu_bar_new ();
+		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+		int parentHandle = parent.fixedHandle;
+		OS.gtk_container_add (parentHandle, handle);
+	} else {
+		handle = OS.gtk_menu_new ();
+		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+	}
+}
+
+void createIMMenu (int imHandle) {
+	if (this.imHandle == imHandle) return;
+	this.imHandle = imHandle;
+	if (imHandle == 0) {
+		if (imItem != 0) {
+			OS.gtk_widget_destroy (imItem);
+			imItem = 0;
+		}
+		if (imSeparator != 0) {
+			OS.gtk_widget_destroy (imSeparator);
+			imSeparator = 0;
+		}
+		return;
+	} 
+	if (imSeparator == 0) {
+		imSeparator = OS.gtk_separator_menu_item_new ();
+		OS.gtk_widget_show (imSeparator);
+		OS.gtk_menu_shell_insert (handle, imSeparator, -1);
+	}
+	if (imItem == 0) {
+		byte[] buffer = Converter.wcsToMbcs (null, SWT.getMessage("SWT_InputMethods"), true);
+		imItem = OS.gtk_image_menu_item_new_with_label (buffer);
+		OS.gtk_widget_show (imItem);
+		OS.gtk_menu_shell_insert (handle, imItem, -1);
+	}
+	int imSubmenu = OS.gtk_menu_new ();
+	OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
+	OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
+}
+
+void createWidget (int index) {
+	checkOrientation (parent);
+	super.createWidget (index);
+	parent.add (this);
+}
+
 /**
  * Returns the default menu item or null if none has
  * been previously set.
@@ -269,17 +269,17 @@ void createWidget (int index) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public MenuItem getDefaultItem () {

-	checkWidget();

-	return null;

-}

-

-public Display getDisplay () {

-	Decorations parent = this.parent;

-	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);

-	return parent.getDisplay ();

-}

-

+public MenuItem getDefaultItem () {
+	checkWidget();
+	return null;
+}
+
+public Display getDisplay () {
+	Decorations parent = this.parent;
+	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);
+	return parent.getDisplay ();
+}
+
 /**
  * Returns <code>true</code> if the receiver is enabled, and
  * <code>false</code> otherwise. A disabled control is typically
@@ -293,11 +293,11 @@ public Display getDisplay () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getEnabled () {

-	checkWidget();

-	return OS.GTK_WIDGET_SENSITIVE (handle);     

-}

-

+public boolean getEnabled () {
+	checkWidget();
+	return OS.GTK_WIDGET_SENSITIVE (handle);     
+}
+
 /**
  * Returns the item at the given, zero-relative index in the
  * receiver. Throws an exception if the index is out of range.
@@ -313,20 +313,20 @@ public boolean getEnabled () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public MenuItem getItem (int index) {

-	checkWidget();

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

-	int count = OS.g_list_length (list);

-	if (imSeparator != 0) count--;

-	if (imItem != 0) count--;

-	if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);

-	int data = OS.g_list_nth_data (list, index);

-	OS.g_list_free (list);

-	if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

-	return (MenuItem) WidgetTable.get (data);

-}

-

+public MenuItem getItem (int index) {
+	checkWidget();
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
+	int count = OS.g_list_length (list);
+	if (imSeparator != 0) count--;
+	if (imItem != 0) count--;
+	if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
+	int data = OS.g_list_nth_data (list, index);
+	OS.g_list_free (list);
+	if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
+	return (MenuItem) WidgetTable.get (data);
+}
+
 /**
  * Returns the number of items contained in the receiver.
  *
@@ -337,17 +337,17 @@ public MenuItem getItem (int index) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int getItemCount () {

-	checkWidget();

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) return 0;

-	int count = OS.g_list_length (list);

-	OS.g_list_free (list);

-	if (imSeparator != 0) count--;

-	if (imItem != 0) count--;

-	return count;

-}

-

+public int getItemCount () {
+	checkWidget();
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) return 0;
+	int count = OS.g_list_length (list);
+	OS.g_list_free (list);
+	if (imSeparator != 0) count--;
+	if (imItem != 0) count--;
+	return count;
+}
+
 /**
  * Returns an array of <code>MenuItem</code>s which are the items
  * in the receiver. 
@@ -364,35 +364,35 @@ public int getItemCount () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public MenuItem [] getItems () {

-	checkWidget();

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) return new MenuItem [0];

-	int count = OS.g_list_length (list);

-	if (imSeparator != 0) count--;

-	if (imItem != 0) count--;

-	MenuItem [] items = new MenuItem [count];

-	for (int i=0; i<count; i++) {

-		int data = OS.g_list_nth_data (list, i);

-		items [i] = (MenuItem) WidgetTable.get (data);

-	}

-	OS.g_list_free (list);

-	return items;

-}

-

-String getNameText () {

-	String result = "";

-	MenuItem [] items = getItems ();

-	int length = items.length;

-	if (length > 0) {

-		for (int i=0; i<length-1; i++) {

-			result = result + items [i].getNameText() + ", ";

-		}

-		result = result + items [length-1].getNameText ();

-	}

-	return result;

-}

-

+public MenuItem [] getItems () {
+	checkWidget();
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) return new MenuItem [0];
+	int count = OS.g_list_length (list);
+	if (imSeparator != 0) count--;
+	if (imItem != 0) count--;
+	MenuItem [] items = new MenuItem [count];
+	for (int i=0; i<count; i++) {
+		int data = OS.g_list_nth_data (list, i);
+		items [i] = (MenuItem) WidgetTable.get (data);
+	}
+	OS.g_list_free (list);
+	return items;
+}
+
+String getNameText () {
+	String result = "";
+	MenuItem [] items = getItems ();
+	int length = items.length;
+	if (length > 0) {
+		for (int i=0; i<length-1; i++) {
+			result = result + items [i].getNameText() + ", ";
+		}
+		result = result + items [length-1].getNameText ();
+	}
+	return result;
+}
+
 /**
  * Returns the receiver's parent, which must be a <code>Decorations</code>.
  *
@@ -403,11 +403,11 @@ String getNameText () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Decorations getParent () {

-	checkWidget();

-	return parent;

-}

-

+public Decorations getParent () {
+	checkWidget();
+	return parent;
+}
+
 /**
  * Returns the receiver's parent item, which must be a
  * <code>MenuItem</code> or null when the receiver is a
@@ -420,11 +420,11 @@ public Decorations getParent () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public MenuItem getParentItem () {

-	checkWidget();

-	return cascade;

-}

-

+public MenuItem getParentItem () {
+	checkWidget();
+	return cascade;
+}
+
 /**
  * Returns the receiver's parent item, which must be a
  * <code>Menu</code> or null when the receiver is a
@@ -437,12 +437,12 @@ public MenuItem getParentItem () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Menu getParentMenu () {

-	checkWidget();

-	if (cascade == null) return null;

-	return cascade.getParent ();

-}

-

+public Menu getParentMenu () {
+	checkWidget();
+	if (cascade == null) return null;
+	return cascade.getParent ();
+}
+
 /**
  * Returns the receiver's shell. For all controls other than
  * shells, this simply returns the control's nearest ancestor
@@ -458,11 +458,11 @@ public Menu getParentMenu () {
  *
  * @see #getParent
  */
-public Shell getShell () {

-	checkWidget();

-	return parent.getShell ();

-}

-

+public Shell getShell () {
+	checkWidget();
+	return parent.getShell ();
+}
+
 /**
  * Returns <code>true</code> if the receiver is visible, and
  * <code>false</code> otherwise.
@@ -480,43 +480,43 @@ public Shell getShell () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getVisible () {

-	checkWidget();

-	return OS.GTK_WIDGET_MAPPED (handle);    

-}

-

-int GtkMenuPositionFunc (int menu, int x, int y, int push_in, int user_data) {

-	if (x != 0) OS.memmove (x, new int [] {this.x}, 4);

-	if (y != 0) OS.memmove (y, new int [] {this.y}, 4);

-	return 0;

-}

-

-int gtk_hide (int widget) {

-	sendEvent (SWT.Hide);

-	return 0;

-}

-

-int gtk_show (int widget) {

-	if ((style & SWT.POP_UP) != 0) return 0;

-	sendEvent (SWT.Show);

-	return 0;

-}

-

-int gtk_show_help (int widget, int helpType) {

-	if (sendHelpEvent (helpType)) OS.gtk_menu_shell_deactivate (handle);

-	return 0;

-}

-

-void hookEvents () {

-	super.hookEvents ();

-	Display display = getDisplay ();

-	int windowProc2 = display.windowProc2;

-	int windowProc3 = display.windowProc3;

-	OS.g_signal_connect (handle, OS.show, windowProc2, SHOW);

-	OS.g_signal_connect (handle, OS.hide, windowProc2, HIDE);

-	OS.g_signal_connect (handle, OS.show_help, windowProc3, SHOW_HELP);

-}

-

+public boolean getVisible () {
+	checkWidget();
+	return OS.GTK_WIDGET_MAPPED (handle);    
+}
+
+int GtkMenuPositionFunc (int menu, int x, int y, int push_in, int user_data) {
+	if (x != 0) OS.memmove (x, new int [] {this.x}, 4);
+	if (y != 0) OS.memmove (y, new int [] {this.y}, 4);
+	return 0;
+}
+
+int gtk_hide (int widget) {
+	sendEvent (SWT.Hide);
+	return 0;
+}
+
+int gtk_show (int widget) {
+	if ((style & SWT.POP_UP) != 0) return 0;
+	sendEvent (SWT.Show);
+	return 0;
+}
+
+int gtk_show_help (int widget, int helpType) {
+	if (sendHelpEvent (helpType)) OS.gtk_menu_shell_deactivate (handle);
+	return 0;
+}
+
+void hookEvents () {
+	super.hookEvents ();
+	Display display = getDisplay ();
+	int windowProc2 = display.windowProc2;
+	int windowProc3 = display.windowProc3;
+	OS.g_signal_connect (handle, OS.show, windowProc2, SHOW);
+	OS.g_signal_connect (handle, OS.hide, windowProc2, HIDE);
+	OS.g_signal_connect (handle, OS.show_help, windowProc3, SHOW_HELP);
+}
+
 /**
  * Searches the receiver's list starting at the first item
  * (index 0) until an item is found that is equal to the 
@@ -534,78 +534,78 @@ void hookEvents () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int indexOf (MenuItem item) {

-	checkWidget();

-	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

-	MenuItem [] items = getItems ();

-	for (int i=0; i<items.length; i++) {

-		if (items [i] == item) return i;

-	}

-	return -1;

-}

-

-/**

- * Returns <code>true</code> if the receiver is enabled and all

- * of the receiver's ancestors are enabled, and <code>false</code>

- * otherwise. A disabled control is typically not selectable from the

- * user interface and draws with an inactive or "grayed" look.

- *

- * @return the receiver's enabled state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @see #getEnabled

+public int indexOf (MenuItem item) {
+	checkWidget();
+	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
+	MenuItem [] items = getItems ();
+	for (int i=0; i<items.length; i++) {
+		if (items [i] == item) return i;
+	}
+	return -1;
+}
+
+/**
+ * Returns <code>true</code> if the receiver is enabled and all
+ * of the receiver's ancestors are enabled, and <code>false</code>
+ * otherwise. A disabled control is typically not selectable from the
+ * user interface and draws with an inactive or "grayed" look.
+ *
+ * @return the receiver's enabled state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see #getEnabled
  */
-public boolean isEnabled () {

-	checkWidget();

-	Menu parentMenu = getParentMenu ();

-	if (parentMenu == null) return getEnabled ();

-	return getEnabled () && parentMenu.isEnabled ();

-}

-

-/**

- * Returns <code>true</code> if the receiver is visible and all

- * of the receiver's ancestors are visible and <code>false</code>

- * otherwise.

- *

- * @return the receiver's visibility state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see #getVisible

+public boolean isEnabled () {
+	checkWidget();
+	Menu parentMenu = getParentMenu ();
+	if (parentMenu == null) return getEnabled ();
+	return getEnabled () && parentMenu.isEnabled ();
+}
+
+/**
+ * Returns <code>true</code> if the receiver is visible and all
+ * of the receiver's ancestors are visible and <code>false</code>
+ * otherwise.
+ *
+ * @return the receiver's visibility state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #getVisible
  */
-public boolean isVisible () {

-	checkWidget();

-	return getVisible ();

-}

-

-void releaseChild () {

-	super.releaseChild ();

-	if (cascade != null) cascade.setMenu (null);

-	if ((style & SWT.BAR) != 0 && this == parent.menuBar) {

-		parent.setMenuBar (null);

-	}

-}

-

-void releaseWidget () {

-	MenuItem [] items = getItems ();

-	for (int i=0; i<items.length; i++) {

-		MenuItem item = items [i];

-		if (!item.isDisposed ()) item.releaseResources ();

-	}

-	if (parent != null) parent.remove (this);

-	super.releaseWidget ();

-	parent = null;

-	cascade = null;

-	imItem = imSeparator = imHandle = 0;

-}

-

+public boolean isVisible () {
+	checkWidget();
+	return getVisible ();
+}
+
+void releaseChild () {
+	super.releaseChild ();
+	if (cascade != null) cascade.setMenu (null);
+	if ((style & SWT.BAR) != 0 && this == parent.menuBar) {
+		parent.setMenuBar (null);
+	}
+}
+
+void releaseWidget () {
+	MenuItem [] items = getItems ();
+	for (int i=0; i<items.length; i++) {
+		MenuItem item = items [i];
+		if (!item.isDisposed ()) item.releaseResources ();
+	}
+	if (parent != null) parent.remove (this);
+	super.releaseWidget ();
+	parent = null;
+	cascade = null;
+	imItem = imSeparator = imHandle = 0;
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the menu events are generated for the control.
@@ -623,22 +623,22 @@ void releaseWidget () {
  * @see MenuListener
  * @see #addMenuListener
  */
-public void removeMenuListener (MenuListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Hide, listener);

-	eventTable.unhook (SWT.Show, listener);

-}

-

-void removeAccelerators (int accelGroup) {

-	MenuItem [] items = getItems ();

-	for (int i = 0; i < items.length; i++) {

-		MenuItem item = items[i];

-		item.removeAccelerators (accelGroup);

-	}

-}

-

+public void removeMenuListener (MenuListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Hide, listener);
+	eventTable.unhook (SWT.Show, listener);
+}
+
+void removeAccelerators (int accelGroup) {
+	MenuItem [] items = getItems ();
+	for (int i = 0; i < items.length; i++) {
+		MenuItem item = items[i];
+		item.removeAccelerators (accelGroup);
+	}
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
@@ -656,27 +656,27 @@ void removeAccelerators (int accelGroup) {
  * @see HelpListener
  * @see #addHelpListener
  */
-public void removeHelpListener (HelpListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Help, listener);

-}

-

-boolean sendHelpEvent (int helpType) {

-	if (selectedItem != null && !selectedItem.isDisposed()) {

-		if (selectedItem.hooks (SWT.Help)) {

-			selectedItem.postEvent (SWT.Help);

-			return true;

-		}

-	}

-	if (hooks (SWT.Help)) {

-		postEvent (SWT.Help);

-		return true;

-	}

-	return parent.sendHelpEvent (helpType);

-}

-

+public void removeHelpListener (HelpListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Help, listener);
+}
+
+boolean sendHelpEvent (int helpType) {
+	if (selectedItem != null && !selectedItem.isDisposed()) {
+		if (selectedItem.hooks (SWT.Help)) {
+			selectedItem.postEvent (SWT.Help);
+			return true;
+		}
+	}
+	if (hooks (SWT.Help)) {
+		postEvent (SWT.Help);
+		return true;
+	}
+	return parent.sendHelpEvent (helpType);
+}
+
 /**
  * Sets the default menu item to the argument or removes
  * the default emphasis when the argument is <code>null</code>.
@@ -691,10 +691,10 @@ boolean sendHelpEvent (int helpType) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setDefaultItem (MenuItem item) {

-	checkWidget();

-}

-

+public void setDefaultItem (MenuItem item) {
+	checkWidget();
+}
+
 /**
  * Enables the receiver if the argument is <code>true</code>,
  * and disables it otherwise. A disabled control is typically
@@ -708,15 +708,15 @@ public void setDefaultItem (MenuItem item) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setEnabled (boolean enabled) {

-	checkWidget();

-	if (enabled) {

-		OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_SENSITIVE);

-	} else {

-		OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_SENSITIVE);

-	}

-}

-

+public void setEnabled (boolean enabled) {
+	checkWidget();
+	if (enabled) {
+		OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_SENSITIVE);
+	} else {
+		OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_SENSITIVE);
+	}
+}
+
 /**
  * Sets the receiver's location to the point specified by
  * the arguments which are relative to the display.
@@ -733,20 +733,20 @@ public void setEnabled (boolean enabled) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setLocation (int x, int y) {

-	checkWidget();

-	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;

-	this.x = x;

-	this.y = y;

-	hasLocation = true;	

-}

-

-public void setLocation (Point location) {

-	checkWidget();

-	if (location == null) error (SWT.ERROR_NULL_ARGUMENT);

-	setLocation (location.x, location.y);

-}

-

+public void setLocation (int x, int y) {
+	checkWidget();
+	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
+	this.x = x;
+	this.y = y;
+	hasLocation = true;	
+}
+
+public void setLocation (Point location) {
+	checkWidget();
+	if (location == null) error (SWT.ERROR_NULL_ARGUMENT);
+	setLocation (location.x, location.y);
+}
+
 /**
  * Marks the receiver as visible if the argument is <code>true</code>,
  * and marks it invisible otherwise. 
@@ -763,26 +763,26 @@ public void setLocation (Point location) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setVisible (boolean visible) {

-	checkWidget();

-	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;

-	if (visible == OS.GTK_WIDGET_MAPPED (handle)) return;

-	if (visible) {

-		sendEvent (SWT.Show);

-		if (getItemCount () != 0) {

-			int address = 0;

-			Callback GtkMenuPositionFunc = null;

-			if (hasLocation) {

-				GtkMenuPositionFunc = new Callback (this, "GtkMenuPositionFunc", 5);

-				address = GtkMenuPositionFunc.getAddress ();

-			}

-			OS.gtk_menu_popup (handle, 0, 0, address, 0, 0, OS.gtk_get_current_event_time());

-			if (GtkMenuPositionFunc != null) GtkMenuPositionFunc.dispose ();

-		} else {

-			sendEvent (SWT.Hide);

-		}

-	} else {

-		OS.gtk_menu_popdown (handle);

-	}

-}

-}

+public void setVisible (boolean visible) {
+	checkWidget();
+	if ((style & (SWT.BAR | SWT.DROP_DOWN)) != 0) return;
+	if (visible == OS.GTK_WIDGET_MAPPED (handle)) return;
+	if (visible) {
+		sendEvent (SWT.Show);
+		if (getItemCount () != 0) {
+			int address = 0;
+			Callback GtkMenuPositionFunc = null;
+			if (hasLocation) {
+				GtkMenuPositionFunc = new Callback (this, "GtkMenuPositionFunc", 5);
+				address = GtkMenuPositionFunc.getAddress ();
+			}
+			OS.gtk_menu_popup (handle, 0, 0, address, 0, 0, OS.gtk_get_current_event_time());
+			if (GtkMenuPositionFunc != null) GtkMenuPositionFunc.dispose ();
+		} else {
+			sendEvent (SWT.Hide);
+		}
+	} else {
+		OS.gtk_menu_popdown (handle);
+	}
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
index 66fc22a16e..df4d279723 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -1,18 +1,18 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.events.*;

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.events.*;
+
 /**
  * Instances of this class represent a selectable user interface object
  * that issues notification when pressed and released. 
@@ -29,10 +29,10 @@ import org.eclipse.swt.events.*;
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
  */
-public class MenuItem extends Item {

-	Menu parent, menu;

-	int accelerator;

-	

+public class MenuItem extends Item {
+	Menu parent, menu;
+	int accelerator;
+	
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Menu</code>) and a style value
@@ -67,12 +67,12 @@ public class MenuItem extends Item {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public MenuItem (Menu parent, int style) {

-	super (parent, checkStyle (style));

-	this.parent = parent;

-	createWidget (parent.getItemCount ());

-}

-

+public MenuItem (Menu parent, int style) {
+	super (parent, checkStyle (style));
+	this.parent = parent;
+	createWidget (parent.getItemCount ());
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Menu</code>), a style value
@@ -108,25 +108,25 @@ public MenuItem (Menu parent, int style) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public MenuItem (Menu parent, int style, int index) {

-	super (parent, checkStyle (style));

-	this.parent = parent;

-	int count = parent.getItemCount ();

-	if (!(0 <= index && index <= count)) {

-		error (SWT.ERROR_INVALID_RANGE);

-	}

-	createWidget (index);

-}

-

-void addAccelerator (int accelGroup) {

-	updateAccelerator (accelGroup, true);

-}

-

-void addAccelerators (int accelGroup) {

-	addAccelerator (accelGroup);

-	if (menu != null) menu.addAccelerators (accelGroup);

-}

-

+public MenuItem (Menu parent, int style, int index) {
+	super (parent, checkStyle (style));
+	this.parent = parent;
+	int count = parent.getItemCount ();
+	if (!(0 <= index && index <= count)) {
+		error (SWT.ERROR_INVALID_RANGE);
+	}
+	createWidget (index);
+}
+
+void addAccelerator (int accelGroup) {
+	updateAccelerator (accelGroup, true);
+}
+
+void addAccelerators (int accelGroup) {
+	addAccelerator (accelGroup);
+	if (menu != null) menu.addAccelerators (accelGroup);
+}
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when the arm events are generated for the control, by sending
@@ -146,13 +146,13 @@ void addAccelerators (int accelGroup) {
  * @see ArmListener
  * @see #removeArmListener
  */
-public void addArmListener (ArmListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener (listener);

-	addListener (SWT.Arm, typedListener);

-}

-

+public void addArmListener (ArmListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Arm, typedListener);
+}
+
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when the help events are generated for the control, by sending
@@ -172,81 +172,81 @@ public void addArmListener (ArmListener listener) {
  * @see HelpListener
  * @see #removeHelpListener
  */
-public void addHelpListener (HelpListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener (listener);

-	addListener (SWT.Help, typedListener);

-}

-

-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the control is selected, by sending

- * it one of the messages defined in the <code>SelectionListener</code>

- * interface.

- * <p>

- * When <code>widgetSelected</code> is called, the stateMask field of the event object is valid.

- * <code>widgetDefaultSelected</code> is not called.

- * </p>

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #removeSelectionListener

- * @see SelectionEvent

+public void addHelpListener (HelpListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Help, typedListener);
+}
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control is selected, by sending
+ * it one of the messages defined in the <code>SelectionListener</code>
+ * interface.
+ * <p>
+ * When <code>widgetSelected</code> is called, the stateMask field of the event object is valid.
+ * <code>widgetDefaultSelected</code> is not called.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
  */
-public void addSelectionListener (SelectionListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener(listener);

-	addListener (SWT.Selection,typedListener);

-	addListener (SWT.DefaultSelection,typedListener);

-}

-

-static int checkStyle (int style) {

-	return checkBits (style, SWT.PUSH, SWT.CHECK, SWT.RADIO, SWT.SEPARATOR, SWT.CASCADE, 0);

-}

-

-void createHandle (int index) {

-	state |= HANDLE;

-	byte [] buffer = new byte [1];

-	int bits = SWT.CHECK | SWT.RADIO | SWT.PUSH | SWT.SEPARATOR;

-	switch (style & bits) {

-		case SWT.SEPARATOR:

-			handle = OS.gtk_separator_menu_item_new ();

-			break;

-		case SWT.RADIO:

-//			handle = OS.gtk_radio_menu_item_new_with_label (0, buffer);

-//			break;

-		case SWT.CHECK:

-			handle = OS.gtk_check_menu_item_new_with_label (buffer);

-			break;

-		case SWT.PUSH:

-		default:

-			handle = OS.gtk_image_menu_item_new_with_label (buffer);

-			break;

-	}

-	if (handle == 0) error (SWT.ERROR_NO_HANDLES);

-	if ((style & SWT.SEPARATOR) == 0) {

-		int label = OS.gtk_bin_get_child (handle);

-		OS.gtk_accel_label_set_accel_widget (label, 0);

-	}

-	int parentHandle = parent.handle;

-	boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);     

-	if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);

-	OS.gtk_menu_shell_insert (parentHandle, handle, index);

-	if (!enabled) OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_SENSITIVE);

-	OS.gtk_widget_show (handle);

-}

-

+public void addSelectionListener (SelectionListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener(listener);
+	addListener (SWT.Selection,typedListener);
+	addListener (SWT.DefaultSelection,typedListener);
+}
+
+static int checkStyle (int style) {
+	return checkBits (style, SWT.PUSH, SWT.CHECK, SWT.RADIO, SWT.SEPARATOR, SWT.CASCADE, 0);
+}
+
+void createHandle (int index) {
+	state |= HANDLE;
+	byte [] buffer = new byte [1];
+	int bits = SWT.CHECK | SWT.RADIO | SWT.PUSH | SWT.SEPARATOR;
+	switch (style & bits) {
+		case SWT.SEPARATOR:
+			handle = OS.gtk_separator_menu_item_new ();
+			break;
+		case SWT.RADIO:
+//			handle = OS.gtk_radio_menu_item_new_with_label (0, buffer);
+//			break;
+		case SWT.CHECK:
+			handle = OS.gtk_check_menu_item_new_with_label (buffer);
+			break;
+		case SWT.PUSH:
+		default:
+			handle = OS.gtk_image_menu_item_new_with_label (buffer);
+			break;
+	}
+	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+	if ((style & SWT.SEPARATOR) == 0) {
+		int label = OS.gtk_bin_get_child (handle);
+		OS.gtk_accel_label_set_accel_widget (label, 0);
+	}
+	int parentHandle = parent.handle;
+	boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);     
+	if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
+	OS.gtk_menu_shell_insert (parentHandle, handle, index);
+	if (!enabled) OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
+	OS.gtk_widget_show (handle);
+}
+
 /**
  * Return the widget accelerator.  An accelerator is the bit-wise
  * OR of zero or more modifier masks and a key. Examples:
@@ -260,26 +260,26 @@ void createHandle (int index) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int getAccelerator () {

-	checkWidget();

-	return accelerator;

-}

-

-int getAccelGroup () {

-	Menu menu = parent;

-	while (menu != null && menu.cascade != null) {

-		menu = menu.cascade.parent;

-	}

-	Decorations shell = menu.parent;

-	return shell.menuBar == menu ? shell.accelGroup : 0;

-}

-

-public Display getDisplay () {

-	Menu parent = this.parent;

-	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);

-	return parent.getDisplay ();

-}

-

+public int getAccelerator () {
+	checkWidget();
+	return accelerator;
+}
+
+int getAccelGroup () {
+	Menu menu = parent;
+	while (menu != null && menu.cascade != null) {
+		menu = menu.cascade.parent;
+	}
+	Decorations shell = menu.parent;
+	return shell.menuBar == menu ? shell.accelGroup : 0;
+}
+
+public Display getDisplay () {
+	Menu parent = this.parent;
+	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);
+	return parent.getDisplay ();
+}
+
 /**
  * Returns <code>true</code> if the receiver is enabled, and
  * <code>false</code> otherwise. A disabled control is typically
@@ -293,11 +293,11 @@ public Display getDisplay () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getEnabled () {

-	checkWidget();

-	return OS.GTK_WIDGET_SENSITIVE(handle);

-}

-

+public boolean getEnabled () {
+	checkWidget();
+	return OS.GTK_WIDGET_SENSITIVE(handle);
+}
+
 /**
  * Returns the receiver's cascade menu if it has one or null
  * if it does not. Only <code>CASCADE</code> menu items can have
@@ -312,11 +312,11 @@ public boolean getEnabled () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Menu getMenu () {

-	checkWidget();

-	return menu;

-}

-

+public Menu getMenu () {
+	checkWidget();
+	return menu;
+}
+
 /**
  * Returns the receiver's parent, which must be a <code>Menu</code>.
  *
@@ -327,11 +327,11 @@ public Menu getMenu () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Menu getParent () {

-	checkWidget();

-	return parent;

-}

-

+public Menu getParent () {
+	checkWidget();
+	return parent;
+}
+
 /**
  * Returns <code>true</code> if the receiver is selected,
  * and false otherwise.
@@ -346,124 +346,124 @@ public Menu getParent () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getSelection () {

-	checkWidget();

-	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;

-	return OS.gtk_check_menu_item_get_active(handle);

-}

-

-int gtk_activate (int widget) {

-	if ((style & SWT.CASCADE) != 0 && menu != null) return 0;

-	/*

-	* Bug in GTK.  When an ancestor menu is disabled and

-	* the user types an accelerator key, GTK delivers the

-	* the activate signal even though the menu item cannot

-	* be invoked using the mouse.  The fix is to ignore activate

-	* signals when an ancestor menu is disabled.

-	*/

-	if (!isEnabled ()) return 0;

-	Event event = new Event ();

-	int ptr = OS.gtk_get_current_event ();

-	if (ptr != 0) {

-		GdkEvent gdkEvent = new GdkEvent ();

-		OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);

-		switch (gdkEvent.type) {

-			case OS.GDK_KEY_PRESS:

-			case OS.GDK_KEY_RELEASE: 

-			case OS.GDK_BUTTON_PRESS:

-			case OS.GDK_2BUTTON_PRESS: 

-			case OS.GDK_BUTTON_RELEASE: {

-				int [] state = new int [1];

-				OS.gdk_event_get_state (ptr, state);

-				setInputState (event, state [0]);

-				break;

-			}

-		}

-		OS.gdk_event_free (ptr);

-	}

-	if ((style & SWT.RADIO) != 0) {

-		if ((parent.getStyle () & SWT.NO_RADIO_GROUP) == 0) {

-			selectRadio ();

-		}

-	}

-	postEvent (SWT.Selection, event);

-	return 0;

-}

-

-int gtk_select (int item) {

-	parent.selectedItem = this;

-	postEvent (SWT.Arm);

-	return 0;

-}

-

-int gtk_show_help (int widget, int helpType) {

-	boolean hooks = hooks (SWT.Help);

-	if (hooks) {

-		postEvent (SWT.Help);

-	} else {

-		hooks = parent.sendHelpEvent (helpType);

-	}

-	if (hooks) OS.gtk_menu_shell_deactivate (parent.handle);

-	return 0;

-}

-

-void hookEvents () {

-	super.hookEvents ();

-	Display display = getDisplay ();

-	int windowProc2 = display.windowProc2;

-	int windowProc3 = display.windowProc3;

-	OS.g_signal_connect (handle, OS.activate, windowProc2, ACTIVATE);

-	OS.g_signal_connect (handle, OS.select, windowProc2, SELECT);

-	OS.g_signal_connect (handle, OS.show_help, windowProc3, SHOW_HELP);

-}

-

-/**

- * Returns <code>true</code> if the receiver is enabled and all

- * of the receiver's ancestors are enabled, and <code>false</code>

- * otherwise. A disabled control is typically not selectable from the

- * user interface and draws with an inactive or "grayed" look.

- *

- * @return the receiver's enabled state

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @see #getEnabled

+public boolean getSelection () {
+	checkWidget();
+	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;
+	return OS.gtk_check_menu_item_get_active(handle);
+}
+
+int gtk_activate (int widget) {
+	if ((style & SWT.CASCADE) != 0 && menu != null) return 0;
+	/*
+	* Bug in GTK.  When an ancestor menu is disabled and
+	* the user types an accelerator key, GTK delivers the
+	* the activate signal even though the menu item cannot
+	* be invoked using the mouse.  The fix is to ignore activate
+	* signals when an ancestor menu is disabled.
+	*/
+	if (!isEnabled ()) return 0;
+	Event event = new Event ();
+	int ptr = OS.gtk_get_current_event ();
+	if (ptr != 0) {
+		GdkEvent gdkEvent = new GdkEvent ();
+		OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
+		switch (gdkEvent.type) {
+			case OS.GDK_KEY_PRESS:
+			case OS.GDK_KEY_RELEASE: 
+			case OS.GDK_BUTTON_PRESS:
+			case OS.GDK_2BUTTON_PRESS: 
+			case OS.GDK_BUTTON_RELEASE: {
+				int [] state = new int [1];
+				OS.gdk_event_get_state (ptr, state);
+				setInputState (event, state [0]);
+				break;
+			}
+		}
+		OS.gdk_event_free (ptr);
+	}
+	if ((style & SWT.RADIO) != 0) {
+		if ((parent.getStyle () & SWT.NO_RADIO_GROUP) == 0) {
+			selectRadio ();
+		}
+	}
+	postEvent (SWT.Selection, event);
+	return 0;
+}
+
+int gtk_select (int item) {
+	parent.selectedItem = this;
+	postEvent (SWT.Arm);
+	return 0;
+}
+
+int gtk_show_help (int widget, int helpType) {
+	boolean hooks = hooks (SWT.Help);
+	if (hooks) {
+		postEvent (SWT.Help);
+	} else {
+		hooks = parent.sendHelpEvent (helpType);
+	}
+	if (hooks) OS.gtk_menu_shell_deactivate (parent.handle);
+	return 0;
+}
+
+void hookEvents () {
+	super.hookEvents ();
+	Display display = getDisplay ();
+	int windowProc2 = display.windowProc2;
+	int windowProc3 = display.windowProc3;
+	OS.g_signal_connect (handle, OS.activate, windowProc2, ACTIVATE);
+	OS.g_signal_connect (handle, OS.select, windowProc2, SELECT);
+	OS.g_signal_connect (handle, OS.show_help, windowProc3, SHOW_HELP);
+}
+
+/**
+ * Returns <code>true</code> if the receiver is enabled and all
+ * of the receiver's ancestors are enabled, and <code>false</code>
+ * otherwise. A disabled control is typically not selectable from the
+ * user interface and draws with an inactive or "grayed" look.
+ *
+ * @return the receiver's enabled state
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @see #getEnabled
  */
-public boolean isEnabled () {

-	return getEnabled () && parent.isEnabled ();

-}

-

-void releaseChild () {

-	super.releaseChild ();

-	if (menu != null) {

-		if (menu.selectedItem == this) menu.selectedItem = null;

-		menu.dispose ();

-	}

-	menu = null;

-}

-

-void releaseWidget () {

-	if (menu != null) menu.releaseResources ();

-	menu = null;

-	super.releaseWidget ();

-	int accelGroup = getAccelGroup ();

-	if (accelGroup != 0) removeAccelerator (accelGroup);

-	accelerator = 0;

-	parent = null;

-}

-

-void removeAccelerator (int accelGroup) {

-	updateAccelerator (accelGroup, false);

-}

-

-void removeAccelerators (int accelGroup) {

-	removeAccelerator (accelGroup);

-	if (menu != null) menu.removeAccelerators (accelGroup);

-}

-

+public boolean isEnabled () {
+	return getEnabled () && parent.isEnabled ();
+}
+
+void releaseChild () {
+	super.releaseChild ();
+	if (menu != null) {
+		if (menu.selectedItem == this) menu.selectedItem = null;
+		menu.dispose ();
+	}
+	menu = null;
+}
+
+void releaseWidget () {
+	if (menu != null) menu.releaseResources ();
+	menu = null;
+	super.releaseWidget ();
+	int accelGroup = getAccelGroup ();
+	if (accelGroup != 0) removeAccelerator (accelGroup);
+	accelerator = 0;
+	parent = null;
+}
+
+void removeAccelerator (int accelGroup) {
+	updateAccelerator (accelGroup, false);
+}
+
+void removeAccelerators (int accelGroup) {
+	removeAccelerator (accelGroup);
+	if (menu != null) menu.removeAccelerators (accelGroup);
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the arm events are generated for the control.
@@ -481,13 +481,13 @@ void removeAccelerators (int accelGroup) {
  * @see ArmListener
  * @see #addArmListener
  */
-public void removeArmListener (ArmListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Arm, listener);

-}

-

+public void removeArmListener (ArmListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Arm, listener);
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the help events are generated for the control.
@@ -505,13 +505,13 @@ public void removeArmListener (ArmListener listener) {
  * @see HelpListener
  * @see #addHelpListener
  */
-public void removeHelpListener (HelpListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Help, listener);

-}

-

+public void removeHelpListener (HelpListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Help, listener);
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the control is selected.
@@ -529,23 +529,23 @@ public void removeHelpListener (HelpListener listener) {
  * @see SelectionListener
  * @see #addSelectionListener
  */
-public void removeSelectionListener (SelectionListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Selection, listener);

-	eventTable.unhook (SWT.DefaultSelection,listener);	

-}

-void selectRadio () {

-	int index = 0;

-	MenuItem [] items = parent.getItems ();

-	while (index < items.length && items [index] != this) index++;

-	int i = index - 1;

-	while (i >= 0 && items [i].setRadioSelection (false)) --i;

-	int j = index + 1;

-	while (j < items.length && items [j].setRadioSelection (false)) j++;

-	setSelection (true);

-}

+public void removeSelectionListener (SelectionListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Selection, listener);
+	eventTable.unhook (SWT.DefaultSelection,listener);	
+}
+void selectRadio () {
+	int index = 0;
+	MenuItem [] items = parent.getItems ();
+	while (index < items.length && items [index] != this) index++;
+	int i = index - 1;
+	while (i >= 0 && items [i].setRadioSelection (false)) --i;
+	int j = index + 1;
+	while (j < items.length && items [j].setRadioSelection (false)) j++;
+	setSelection (true);
+}
 /**
  * Sets the widget accelerator.  An accelerator is the bit-wise
  * OR of zero or more modifier masks and a key. Examples:
@@ -559,15 +559,15 @@ void selectRadio () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setAccelerator (int accelerator) {

-	checkWidget();

-	if (this.accelerator == accelerator) return;

-	int accelGroup = getAccelGroup ();

-	if (accelGroup != 0) removeAccelerator (accelGroup);

-	this.accelerator = accelerator;

-	if (accelGroup != 0) addAccelerator (accelGroup);

-}

-

+public void setAccelerator (int accelerator) {
+	checkWidget();
+	if (this.accelerator == accelerator) return;
+	int accelGroup = getAccelGroup ();
+	if (accelGroup != 0) removeAccelerator (accelGroup);
+	this.accelerator = accelerator;
+	if (accelGroup != 0) addAccelerator (accelGroup);
+}
+
 /**
  * Enables the receiver if the argument is <code>true</code>,
  * and disables it otherwise. A disabled control is typically
@@ -581,11 +581,11 @@ public void setAccelerator (int accelerator) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setEnabled (boolean enabled) {

-	checkWidget();

-	OS.gtk_widget_set_sensitive (handle, enabled);

-}

-

+public void setEnabled (boolean enabled) {
+	checkWidget();
+	OS.gtk_widget_set_sensitive (handle, enabled);
+}
+
 /**
  * Sets the image the receiver will display to the argument.
  * <p>
@@ -599,20 +599,20 @@ public void setEnabled (boolean enabled) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setImage (Image image) {

-	checkWidget();

-	if ((style & SWT.SEPARATOR) != 0) return;

-	super.setImage (image);

-	if ((style & SWT.PUSH) == 0) return;

-	if (image != null) {

-		int imageHandle = OS.gtk_image_new_from_pixmap (image.pixmap, image.mask);

-		OS.gtk_image_menu_item_set_image (handle, imageHandle);

-		OS.gtk_widget_show (imageHandle);

-	} else {

-		OS.gtk_image_menu_item_set_image (handle, 0);

-	}

-}

-

+public void setImage (Image image) {
+	checkWidget();
+	if ((style & SWT.SEPARATOR) != 0) return;
+	super.setImage (image);
+	if ((style & SWT.PUSH) == 0) return;
+	if (image != null) {
+		int imageHandle = OS.gtk_image_new_from_pixmap (image.pixmap, image.mask);
+		OS.gtk_image_menu_item_set_image (handle, imageHandle);
+		OS.gtk_widget_show (imageHandle);
+	} else {
+		OS.gtk_image_menu_item_set_image (handle, 0);
+	}
+}
+
 /**
  * Sets the receiver's pull down menu to the argument.
  * Only <code>CASCADE</code> menu items can have a
@@ -633,52 +633,52 @@ public void setImage (Image image) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setMenu (Menu menu) {

-	checkWidget ();

-

-	/* Check to make sure the new menu is valid */

-	if ((style & SWT.CASCADE) == 0) {

-		error (SWT.ERROR_MENUITEM_NOT_CASCADE);

-	}

-	if (menu != null) {

-		if ((menu.style & SWT.DROP_DOWN) == 0) {

-			error (SWT.ERROR_MENU_NOT_DROP_DOWN);

-		}

-		if (menu.parent != parent.parent) {

-			error (SWT.ERROR_INVALID_PARENT);

-		}

-	}

-

-	/* Assign the new menu */

-	Menu oldMenu = this.menu;

-	if (oldMenu == menu) return;

-	int accelGroup = getAccelGroup ();

-	if (accelGroup != 0) removeAccelerators (accelGroup);

-	if (oldMenu != null) {

-		oldMenu.cascade = null;

-		/*

-		* Add a reference to the menu we are about

-		* to replace or GTK will destroy it.

-		*/

-		OS.g_object_ref (oldMenu.handle);

-		OS.gtk_menu_item_remove_submenu (handle);

-	}

-	if ((this.menu = menu) != null) {

-		menu.cascade = this;

-		OS.gtk_menu_item_set_submenu (handle, menu.handle);

-	}

-	if (accelGroup != 0) addAccelerators (accelGroup);

-}

-

-boolean setRadioSelection (boolean value) {

-	if ((style & SWT.RADIO) == 0) return false;

-	if (getSelection () != value) {

-		setSelection (value);

-		postEvent (SWT.Selection);

-	}

-	return true;

-}

-

+public void setMenu (Menu menu) {
+	checkWidget ();
+
+	/* Check to make sure the new menu is valid */
+	if ((style & SWT.CASCADE) == 0) {
+		error (SWT.ERROR_MENUITEM_NOT_CASCADE);
+	}
+	if (menu != null) {
+		if ((menu.style & SWT.DROP_DOWN) == 0) {
+			error (SWT.ERROR_MENU_NOT_DROP_DOWN);
+		}
+		if (menu.parent != parent.parent) {
+			error (SWT.ERROR_INVALID_PARENT);
+		}
+	}
+
+	/* Assign the new menu */
+	Menu oldMenu = this.menu;
+	if (oldMenu == menu) return;
+	int accelGroup = getAccelGroup ();
+	if (accelGroup != 0) removeAccelerators (accelGroup);
+	if (oldMenu != null) {
+		oldMenu.cascade = null;
+		/*
+		* Add a reference to the menu we are about
+		* to replace or GTK will destroy it.
+		*/
+		OS.g_object_ref (oldMenu.handle);
+		OS.gtk_menu_item_remove_submenu (handle);
+	}
+	if ((this.menu = menu) != null) {
+		menu.cascade = this;
+		OS.gtk_menu_item_set_submenu (handle, menu.handle);
+	}
+	if (accelGroup != 0) addAccelerators (accelGroup);
+}
+
+boolean setRadioSelection (boolean value) {
+	if ((style & SWT.RADIO) == 0) return false;
+	if (getSelection () != value) {
+		setSelection (value);
+		postEvent (SWT.Selection);
+	}
+	return true;
+}
+
 /**
  * Sets the selection state of the receiver.
  * <p>
@@ -692,57 +692,57 @@ boolean setRadioSelection (boolean value) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setSelection (boolean selected) {

-	checkWidget();

-	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;

-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);

-	OS.gtk_check_menu_item_set_active (handle, selected);

-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);

-}

-

-public void setText (String string) {

-	checkWidget();

-	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if ((style & SWT.SEPARATOR) != 0) return;

-	super.setText (string);

-	String accelString = "";

-	int index = string.indexOf ('\t');

-	if (index != -1) {

-		accelString = string.substring (index, string.length());

-		string = string.substring (0, index);

-	}

-	char [] chars = fixMnemonic (string);

-	byte [] buffer = Converter.wcsToMbcs (null, chars, false);

-	int label = OS.gtk_bin_get_child (handle);

-	OS.gtk_label_set_text_with_mnemonic (label, buffer);

-	buffer = Converter.wcsToMbcs (null, accelString, true);

-	int ptr = OS.g_malloc (buffer.length);

-	OS.memmove (ptr, buffer, buffer.length);

-	int oldPtr = OS.GTK_ACCEL_LABEL_ACCEL_STRING (label);

-	OS.GTK_ACCEL_LABEL_ACCEL_STRING (label, ptr);

-	if (oldPtr != 0) OS.g_free (oldPtr);

-}

-

-void updateAccelerator (int accelGroup, boolean add) {

-	if (accelerator == 0) return;

-	int mask = 0;

-	if ((accelerator & SWT.ALT) != 0) mask |= OS.GDK_MOD1_MASK;

-	if ((accelerator & SWT.SHIFT) != 0) mask |= OS.GDK_SHIFT_MASK;

-	if ((accelerator & SWT.CONTROL) != 0) mask |= OS.GDK_CONTROL_MASK;

-	int keysym = accelerator & SWT.KEY_MASK;

-	int newKey = Display.untranslateKey (keysym);

-	if (newKey != 0) {

-		keysym = newKey;

-	} else {

-		switch (keysym) {

-			case '\r': keysym = OS.GDK_Return; break;

-			default: keysym = wcsToMbcs ((char) keysym);

-		}

-	}

-	if (add) {

-		OS.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, keysym, mask, OS.GTK_ACCEL_VISIBLE);

-	} else {

-		OS.gtk_widget_remove_accelerator (handle, accelGroup, keysym, mask);

-	}

-}

-}

+public void setSelection (boolean selected) {
+	checkWidget();
+	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;
+	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);
+	OS.gtk_check_menu_item_set_active (handle, selected);
+	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);
+}
+
+public void setText (String string) {
+	checkWidget();
+	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if ((style & SWT.SEPARATOR) != 0) return;
+	super.setText (string);
+	String accelString = "";
+	int index = string.indexOf ('\t');
+	if (index != -1) {
+		accelString = string.substring (index, string.length());
+		string = string.substring (0, index);
+	}
+	char [] chars = fixMnemonic (string);
+	byte [] buffer = Converter.wcsToMbcs (null, chars, false);
+	int label = OS.gtk_bin_get_child (handle);
+	OS.gtk_label_set_text_with_mnemonic (label, buffer);
+	buffer = Converter.wcsToMbcs (null, accelString, true);
+	int ptr = OS.g_malloc (buffer.length);
+	OS.memmove (ptr, buffer, buffer.length);
+	int oldPtr = OS.GTK_ACCEL_LABEL_ACCEL_STRING (label);
+	OS.GTK_ACCEL_LABEL_ACCEL_STRING (label, ptr);
+	if (oldPtr != 0) OS.g_free (oldPtr);
+}
+
+void updateAccelerator (int accelGroup, boolean add) {
+	if (accelerator == 0) return;
+	int mask = 0;
+	if ((accelerator & SWT.ALT) != 0) mask |= OS.GDK_MOD1_MASK;
+	if ((accelerator & SWT.SHIFT) != 0) mask |= OS.GDK_SHIFT_MASK;
+	if ((accelerator & SWT.CONTROL) != 0) mask |= OS.GDK_CONTROL_MASK;
+	int keysym = accelerator & SWT.KEY_MASK;
+	int newKey = Display.untranslateKey (keysym);
+	if (newKey != 0) {
+		keysym = newKey;
+	} else {
+		switch (keysym) {
+			case '\r': keysym = OS.GDK_Return; break;
+			default: keysym = wcsToMbcs ((char) keysym);
+		}
+	}
+	if (add) {
+		OS.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, keysym, mask, OS.GTK_ACCEL_VISIBLE);
+	} else {
+		OS.gtk_widget_remove_accelerator (handle, accelGroup, keysym, mask);
+	}
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
index a8c7eef48d..06237750a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
@@ -1,43 +1,43 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.events.*;

-

-/**

- * Instances of this class implement the notebook user interface

- * metaphor.  It allows the user to select a notebook page from

- * set of pages.

- * <p>

- * The item children that may be added to instances of this class

- * must be of type <code>TabItem</code>.

- * <code>Control</code> children are created and then set into a

- * tab item using <code>TabItem#setControl</code>.

- * </p><p>

- * Note that although this class is a subclass of <code>Composite</code>,

- * it does not make sense to set a layout on it.

- * </p><p>

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>Selection</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class TabFolder extends Composite {

-	TabItem [] items;

-

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.events.*;
+
+/**
+ * Instances of this class implement the notebook user interface
+ * metaphor.  It allows the user to select a notebook page from
+ * set of pages.
+ * <p>
+ * The item children that may be added to instances of this class
+ * must be of type <code>TabItem</code>.
+ * <code>Control</code> children are created and then set into a
+ * tab item using <code>TabItem#setControl</code>.
+ * </p><p>
+ * Note that although this class is a subclass of <code>Composite</code>,
+ * it does not make sense to set a layout on it.
+ * </p><p>
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Selection</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
+ */
+public class TabFolder extends Composite {
+	TabItem [] items;
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -66,233 +66,233 @@ public class TabFolder extends Composite {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TabFolder (Composite parent, int style) {

-	super (parent, checkStyle (style));

-}

-

-static int checkStyle (int style) {

-	/*

-	* Even though it is legal to create this widget

-	* with scroll bars, they serve no useful purpose

-	* because they do not automatically scroll the

-	* widget's client area.  The fix is to clear

-	* the SWT style.

-	*/

-	return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);

-}

-

-

-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the receiver's selection changes, by sending

- * it one of the messages defined in the <code>SelectionListener</code>

- * interface.

- * <p>

- * When <code>widgetSelected</code> is called, the item field of the event object is valid.

- * <code>widgetDefaultSelected</code> is not called.

- * </p>

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see SelectionListener

- * @see #removeSelectionListener

- * @see SelectionEvent

+public TabFolder (Composite parent, int style) {
+	super (parent, checkStyle (style));
+}
+
+static int checkStyle (int style) {
+	/*
+	* Even though it is legal to create this widget
+	* with scroll bars, they serve no useful purpose
+	* because they do not automatically scroll the
+	* widget's client area.  The fix is to clear
+	* the SWT style.
+	*/
+	return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
+}
+
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's selection changes, by sending
+ * it one of the messages defined in the <code>SelectionListener</code>
+ * interface.
+ * <p>
+ * When <code>widgetSelected</code> is called, the item field of the event object is valid.
+ * <code>widgetDefaultSelected</code> is not called.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
  */
-public void addSelectionListener(SelectionListener listener) {

-	checkWidget ();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener(listener);

-	addListener(SWT.Selection,typedListener);

-	addListener(SWT.DefaultSelection,typedListener);

-}

-

-int clientHandle () {

-	int index = OS.gtk_notebook_get_current_page (handle);

-	if (index != -1 && items [index] != null) {

-		return items [index].pageHandle;

-	}

-	return handle;

-}

-

-public Point computeSize (int wHint, int hHint, boolean changed) {

-	checkWidget ();

-	int width = OS.GTK_WIDGET_WIDTH (fixedHandle);

-	int height = OS.GTK_WIDGET_HEIGHT (fixedHandle);

-	OS.gtk_widget_set_size_request (handle, wHint, hHint);

-	GtkRequisition requisition = new GtkRequisition ();

-	boolean scrollable = OS.gtk_notebook_get_scrollable (handle);

-	OS.gtk_notebook_set_scrollable (handle, false);

-	OS.gtk_widget_size_request (handle, requisition);

-	OS.gtk_notebook_set_scrollable (handle, scrollable);

-	OS.gtk_widget_set_size_request (handle, width, height);

-	width = wHint == SWT.DEFAULT ? requisition.width : wHint;

-	height = hHint == SWT.DEFAULT ? requisition.height : hHint;

-	Point size;

-	if (layout != null) {

-		size = layout.computeSize (this, wHint, hHint, changed);

-	} else {

-		size = minimumSize (wHint, hHint, changed);

-	}

-	Rectangle trim = computeTrim (0, 0, size.x, size.y);

-	size.x = trim.width;  size.y = trim.height;

-	if (size.x == 0) size.x = DEFAULT_WIDTH;

-	if (size.y == 0) size.y = DEFAULT_HEIGHT;

-	if (wHint != SWT.DEFAULT) size.x = wHint;

-	if (hHint != SWT.DEFAULT) size.y = hHint;

-	width = Math.max (width, size.x);

-	height = Math.max (height, size.y);

-	return new Point (width, height);

-}

-

-public Rectangle computeTrim (int x, int y, int width, int height) {

-	checkWidget();

-	int clientHandle = clientHandle ();

-	int clientX = OS.GTK_WIDGET_X (clientHandle);

-	int clientY = OS.GTK_WIDGET_Y (clientHandle);

-	x -= clientX;

-	y -= clientY;

-	width +=  clientX + clientX;

-	height +=  clientX + clientY;

-	return new Rectangle (x, y, width, height);

-}

-

-void createHandle (int index) {

-	state |= HANDLE;

-	fixedHandle = OS.gtk_fixed_new ();

-	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);

-	OS.gtk_fixed_set_has_window (fixedHandle, true);

-	handle = OS.gtk_notebook_new ();

-	if (handle == 0) error (SWT.ERROR_NO_HANDLES);

-	int parentHandle = parent.parentingHandle ();

-	OS.gtk_container_add (parentHandle, fixedHandle);

-	OS.gtk_container_add (fixedHandle, handle);

-	OS.gtk_widget_show (handle);

-	OS.gtk_widget_show (fixedHandle);

-	OS.gtk_notebook_set_scrollable (handle, true);

-	OS.gtk_notebook_set_show_tabs (handle, true);

-}

-

-void createWidget (int index) {

-	super.createWidget(index);

-	items = new TabItem [4];

-}

-

-void createItem (TabItem item, int index) {

-	int list = OS.gtk_container_get_children (handle);

-	int itemCount = 0;

-	if (list != 0) {

-		itemCount = OS.g_list_length (list);

-		OS.g_list_free (list);

-	}

-	if (!(0 <= index && index <= itemCount)) error (SWT.ERROR_ITEM_NOT_ADDED);

-	if (itemCount == items.length) {

-		TabItem [] newItems = new TabItem [items.length + 4];

-		System.arraycopy (items, 0, newItems, 0, items.length);

-		items = newItems;

-	}

-	int boxHandle = OS.gtk_hbox_new (false, 0);

-	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);

-	int labelHandle = OS.gtk_label_new_with_mnemonic (null);

-	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);

-	int imageHandle = OS.gtk_image_new ();

-	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);

-	OS.gtk_container_add (boxHandle, imageHandle);

-	OS.gtk_container_add (boxHandle, labelHandle);

-	int pageHandle = OS.gtk_fixed_new ();

-	if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);

-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);

-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	OS.gtk_widget_show (boxHandle);

-	OS.gtk_widget_show (labelHandle);

-	OS.gtk_widget_show (pageHandle);

-	item.state |= HANDLE;

-	item.handle = boxHandle;

-	item.labelHandle = labelHandle;

-	item.imageHandle = imageHandle;

-	item.pageHandle = pageHandle;

-	System.arraycopy (items, index, items, index + 1, itemCount++ - index);

-	items [index] = item;

-	item.setForegroundColor (getForegroundColor ());

-	item.setFontDescription (getFontDescription ());

-	if (itemCount == 1) {

-		fixPage ();

-		Event event = new Event();

-		event.item = items[0];

-		sendEvent (SWT.Selection, event);

-		// the widget could be destroyed at this point

-	}

-}

-

-void fixPage () {

-	/*

-	* Feature in GTK.  For some reason, the positioning of

-	* tab labels and pages become corrupted when when there

-	* is no current page.  The fix is to force the notebook

-	* to resize which causes the current page to be set.

-	*/

-//	int index = OS.gtk_notebook_get_current_page (handle);

-//	if (index != -1) return;

-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	int flags = OS.GTK_WIDGET_FLAGS (handle);

-	OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_VISIBLE);

-	GtkRequisition requisition = new GtkRequisition ();

-	OS.gtk_widget_size_request (handle, requisition);

-	OS.gtk_container_resize_children (handle);

-	if ((flags & OS.GTK_VISIBLE) == 0) {

-		OS.GTK_WIDGET_UNSET_FLAGS(handle, OS.GTK_VISIBLE);	

-	}

-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-}

-

-void destroyItem (TabItem item) {

-	int index = 0;

-	int itemCount = getItemCount();

-	while (index < itemCount) {

-		if (items [index] == item) break;

-		index++;

-	}

-	if (index == itemCount) error (SWT.ERROR_ITEM_NOT_REMOVED);

-	int oldIndex = OS.gtk_notebook_get_current_page (handle);

-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	OS.gtk_notebook_remove_page (handle, index);

-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	System.arraycopy (items, index + 1, items, index, --itemCount - index);

-	items [itemCount] = null;

-	item.handle = 0;

-	if (index == oldIndex) {

-		fixPage ();

-		int newIndex = OS.gtk_notebook_get_current_page (handle);

-		if (newIndex != -1) {

-			Control control = items [newIndex].getControl ();

-			if (control != null && !control.isDisposed ()) {

-				control.setBounds (getClientArea());

-				control.setVisible (true);

-			}

-			Event event = new Event ();

-			event.item = items [newIndex];

-			sendEvent (SWT.Selection, event);	

-			// the widget could be destroyed at this point

-		}

-	}

-}

-

-void enableWidget (boolean enabled) {

-	OS.gtk_widget_set_sensitive (handle, enabled);

-}

-

-int eventHandle () {

-	return fixedHandle;

-}

-		

+public void addSelectionListener(SelectionListener listener) {
+	checkWidget ();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener(listener);
+	addListener(SWT.Selection,typedListener);
+	addListener(SWT.DefaultSelection,typedListener);
+}
+
+int clientHandle () {
+	int index = OS.gtk_notebook_get_current_page (handle);
+	if (index != -1 && items [index] != null) {
+		return items [index].pageHandle;
+	}
+	return handle;
+}
+
+public Point computeSize (int wHint, int hHint, boolean changed) {
+	checkWidget ();
+	int width = OS.GTK_WIDGET_WIDTH (fixedHandle);
+	int height = OS.GTK_WIDGET_HEIGHT (fixedHandle);
+	OS.gtk_widget_set_size_request (handle, wHint, hHint);
+	GtkRequisition requisition = new GtkRequisition ();
+	boolean scrollable = OS.gtk_notebook_get_scrollable (handle);
+	OS.gtk_notebook_set_scrollable (handle, false);
+	OS.gtk_widget_size_request (handle, requisition);
+	OS.gtk_notebook_set_scrollable (handle, scrollable);
+	OS.gtk_widget_set_size_request (handle, width, height);
+	width = wHint == SWT.DEFAULT ? requisition.width : wHint;
+	height = hHint == SWT.DEFAULT ? requisition.height : hHint;
+	Point size;
+	if (layout != null) {
+		size = layout.computeSize (this, wHint, hHint, changed);
+	} else {
+		size = minimumSize (wHint, hHint, changed);
+	}
+	Rectangle trim = computeTrim (0, 0, size.x, size.y);
+	size.x = trim.width;  size.y = trim.height;
+	if (size.x == 0) size.x = DEFAULT_WIDTH;
+	if (size.y == 0) size.y = DEFAULT_HEIGHT;
+	if (wHint != SWT.DEFAULT) size.x = wHint;
+	if (hHint != SWT.DEFAULT) size.y = hHint;
+	width = Math.max (width, size.x);
+	height = Math.max (height, size.y);
+	return new Point (width, height);
+}
+
+public Rectangle computeTrim (int x, int y, int width, int height) {
+	checkWidget();
+	int clientHandle = clientHandle ();
+	int clientX = OS.GTK_WIDGET_X (clientHandle);
+	int clientY = OS.GTK_WIDGET_Y (clientHandle);
+	x -= clientX;
+	y -= clientY;
+	width +=  clientX + clientX;
+	height +=  clientX + clientY;
+	return new Rectangle (x, y, width, height);
+}
+
+void createHandle (int index) {
+	state |= HANDLE;
+	fixedHandle = OS.gtk_fixed_new ();
+	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	OS.gtk_fixed_set_has_window (fixedHandle, true);
+	handle = OS.gtk_notebook_new ();
+	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+	int parentHandle = parent.parentingHandle ();
+	OS.gtk_container_add (parentHandle, fixedHandle);
+	OS.gtk_container_add (fixedHandle, handle);
+	OS.gtk_widget_show (handle);
+	OS.gtk_widget_show (fixedHandle);
+	OS.gtk_notebook_set_scrollable (handle, true);
+	OS.gtk_notebook_set_show_tabs (handle, true);
+}
+
+void createWidget (int index) {
+	super.createWidget(index);
+	items = new TabItem [4];
+}
+
+void createItem (TabItem item, int index) {
+	int list = OS.gtk_container_get_children (handle);
+	int itemCount = 0;
+	if (list != 0) {
+		itemCount = OS.g_list_length (list);
+		OS.g_list_free (list);
+	}
+	if (!(0 <= index && index <= itemCount)) error (SWT.ERROR_ITEM_NOT_ADDED);
+	if (itemCount == items.length) {
+		TabItem [] newItems = new TabItem [items.length + 4];
+		System.arraycopy (items, 0, newItems, 0, items.length);
+		items = newItems;
+	}
+	int boxHandle = OS.gtk_hbox_new (false, 0);
+	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	int labelHandle = OS.gtk_label_new_with_mnemonic (null);
+	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	int imageHandle = OS.gtk_image_new ();
+	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	OS.gtk_container_add (boxHandle, imageHandle);
+	OS.gtk_container_add (boxHandle, labelHandle);
+	int pageHandle = OS.gtk_fixed_new ();
+	if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
+	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
+	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	OS.gtk_widget_show (boxHandle);
+	OS.gtk_widget_show (labelHandle);
+	OS.gtk_widget_show (pageHandle);
+	item.state |= HANDLE;
+	item.handle = boxHandle;
+	item.labelHandle = labelHandle;
+	item.imageHandle = imageHandle;
+	item.pageHandle = pageHandle;
+	System.arraycopy (items, index, items, index + 1, itemCount++ - index);
+	items [index] = item;
+	item.setForegroundColor (getForegroundColor ());
+	item.setFontDescription (getFontDescription ());
+	if (itemCount == 1) {
+		fixPage ();
+		Event event = new Event();
+		event.item = items[0];
+		sendEvent (SWT.Selection, event);
+		// the widget could be destroyed at this point
+	}
+}
+
+void fixPage () {
+	/*
+	* Feature in GTK.  For some reason, the positioning of
+	* tab labels and pages become corrupted when when there
+	* is no current page.  The fix is to force the notebook
+	* to resize which causes the current page to be set.
+	*/
+//	int index = OS.gtk_notebook_get_current_page (handle);
+//	if (index != -1) return;
+	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	int flags = OS.GTK_WIDGET_FLAGS (handle);
+	OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_VISIBLE);
+	GtkRequisition requisition = new GtkRequisition ();
+	OS.gtk_widget_size_request (handle, requisition);
+	OS.gtk_container_resize_children (handle);
+	if ((flags & OS.GTK_VISIBLE) == 0) {
+		OS.GTK_WIDGET_UNSET_FLAGS(handle, OS.GTK_VISIBLE);	
+	}
+	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+}
+
+void destroyItem (TabItem item) {
+	int index = 0;
+	int itemCount = getItemCount();
+	while (index < itemCount) {
+		if (items [index] == item) break;
+		index++;
+	}
+	if (index == itemCount) error (SWT.ERROR_ITEM_NOT_REMOVED);
+	int oldIndex = OS.gtk_notebook_get_current_page (handle);
+	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	OS.gtk_notebook_remove_page (handle, index);
+	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	System.arraycopy (items, index + 1, items, index, --itemCount - index);
+	items [itemCount] = null;
+	item.handle = 0;
+	if (index == oldIndex) {
+		fixPage ();
+		int newIndex = OS.gtk_notebook_get_current_page (handle);
+		if (newIndex != -1) {
+			Control control = items [newIndex].getControl ();
+			if (control != null && !control.isDisposed ()) {
+				control.setBounds (getClientArea());
+				control.setVisible (true);
+			}
+			Event event = new Event ();
+			event.item = items [newIndex];
+			sendEvent (SWT.Selection, event);	
+			// the widget could be destroyed at this point
+		}
+	}
+}
+
+void enableWidget (boolean enabled) {
+	OS.gtk_widget_set_sensitive (handle, enabled);
+}
+
+int eventHandle () {
+	return fixedHandle;
+}
+		
 /**
  * Returns the item at the given, zero-relative index in the
  * receiver. Throws an exception if the index is out of range.
@@ -308,17 +308,17 @@ int eventHandle () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public TabItem getItem (int index) {

-	checkWidget();

-	if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);	

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);

-	int itemCount = OS.g_list_length (list);

-	OS.g_list_free (list);

-	if (!(0 <= index && index < itemCount)) error (SWT.ERROR_CANNOT_GET_ITEM);

-	return items [index];

-}

-

+public TabItem getItem (int index) {
+	checkWidget();
+	if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);	
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
+	int itemCount = OS.g_list_length (list);
+	OS.g_list_free (list);
+	if (!(0 <= index && index < itemCount)) error (SWT.ERROR_CANNOT_GET_ITEM);
+	return items [index];
+}
+
 /**
  * Returns the number of items contained in the receiver.
  *
@@ -329,15 +329,15 @@ public TabItem getItem (int index) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int getItemCount () {

-	checkWidget();

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) return 0;

-	int itemCount = OS.g_list_length (list);

-	OS.g_list_free (list);

-	return itemCount;

-}

-

+public int getItemCount () {
+	checkWidget();
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) return 0;
+	int itemCount = OS.g_list_length (list);
+	OS.g_list_free (list);
+	return itemCount;
+}
+
 /**
  * Returns an array of <code>TabItem</code>s which are the items
  * in the receiver. 
@@ -354,14 +354,14 @@ public int getItemCount () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public TabItem [] getItems () {

-	checkWidget();

-	int count = getItemCount ();

-	TabItem [] result = new TabItem [count];

-	System.arraycopy (items, 0, result, 0, count);

-	return result;

-}

-

+public TabItem [] getItems () {
+	checkWidget();
+	int count = getItemCount ();
+	TabItem [] result = new TabItem [count];
+	System.arraycopy (items, 0, result, 0, count);
+	return result;
+}
+
 /**
  * Returns an array of <code>TabItem</code>s that are currently
  * selected in the receiver. An empty array indicates that no
@@ -378,13 +378,13 @@ public TabItem [] getItems () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public TabItem [] getSelection () {

-	checkWidget();

-	int index = OS.gtk_notebook_get_current_page (handle);

-	if (index == -1) return new TabItem [0];

-	return new TabItem [] {items [index]};

-}

-

+public TabItem [] getSelection () {
+	checkWidget();
+	int index = OS.gtk_notebook_get_current_page (handle);
+	if (index == -1) return new TabItem [0];
+	return new TabItem [] {items [index]};
+}
+
 /**
  * Returns the zero-relative index of the item which is currently
  * selected in the receiver, or -1 if no item is selected.
@@ -396,36 +396,36 @@ public TabItem [] getSelection () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int getSelectionIndex () {

-	checkWidget();

-	return OS.gtk_notebook_get_current_page (handle);

-}

-

-int gtk_switch_page (int widget, int page, int page_num) {

-	int index = OS.gtk_notebook_get_current_page (handle);

-	if (index != -1) {

-		Control control = items [index].getControl ();

-		if (control != null && !control.isDisposed ()) {

-			control.setVisible (false);

-		}

-	}

-	Control control = items [page_num].getControl ();

-	if (control != null && !control.isDisposed ()) {

-		control.setBounds(getClientArea());

-		control.setVisible (true);

-	}

-	Event event = new Event();

-	event.item = items[page_num];

-	postEvent(SWT.Selection, event);

-	return 0;

-}

-

-void hookEvents () {

-	super.hookEvents ();

-	Display display = getDisplay ();

-	OS.g_signal_connect (handle, OS.switch_page, display.windowProc4, SWITCH_PAGE);

-}

-

+public int getSelectionIndex () {
+	checkWidget();
+	return OS.gtk_notebook_get_current_page (handle);
+}
+
+int gtk_switch_page (int widget, int page, int page_num) {
+	int index = OS.gtk_notebook_get_current_page (handle);
+	if (index != -1) {
+		Control control = items [index].getControl ();
+		if (control != null && !control.isDisposed ()) {
+			control.setVisible (false);
+		}
+	}
+	Control control = items [page_num].getControl ();
+	if (control != null && !control.isDisposed ()) {
+		control.setBounds(getClientArea());
+		control.setVisible (true);
+	}
+	Event event = new Event();
+	event.item = items[page_num];
+	postEvent(SWT.Selection, event);
+	return 0;
+}
+
+void hookEvents () {
+	super.hookEvents ();
+	Display display = getDisplay ();
+	OS.g_signal_connect (handle, OS.switch_page, display.windowProc4, SWITCH_PAGE);
+}
+
 /**
  * Searches the receiver's list starting at the first item
  * (index 0) until an item is found that is equal to the 
@@ -443,58 +443,58 @@ void hookEvents () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int indexOf (TabItem item) {

-	checkWidget();

-	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);

-	int list = OS.gtk_container_get_children (handle);

-	if (list == 0) return -1;

-	int count = OS.g_list_length (list);

-	OS.g_list_free (list);

-	for (int i=0; i<count; i++) {

-		if (items [i] == item) return i;

-	}

-	return -1;

-}

-

-Point minimumSize (int wHint, int hHint, boolean flushCache) {

-	Control [] children = _getChildren ();

-	int width = 0, height = 0;

-	for (int i=0; i<children.length; i++) {

-		Control child = children [i];

-		int index = 0;

-		int count = 0;

-		int list = OS.gtk_container_get_children (handle);

-		if (list != 0) {

-			count = OS.g_list_length (list);

-			OS.g_list_free (list);

-		}

-		while (index < count) {

-			if (items [index].control == child) break;

-			index++;

-		}

-		if (index == count) {

-			Rectangle rect = child.getBounds ();

-			width = Math.max (width, rect.x + rect.width);

-			height = Math.max (height, rect.y + rect.height);

-		} else {

-			Point size = child.computeSize (wHint, hHint, flushCache);

-			width = Math.max (width, size.x);

-			height = Math.max (height, size.y);

-		}

-	}

-	return new Point (width, height);

-}

-

-void releaseWidget () {

-	int count = getItemCount ();

-	for (int i=0; i<count; i++) {

-		TabItem item = items [i];

-		if (!item.isDisposed ()) item.releaseResources ();

-	}

-	items = null;

-	super.releaseWidget ();

-}

-

+public int indexOf (TabItem item) {
+	checkWidget();
+	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
+	int list = OS.gtk_container_get_children (handle);
+	if (list == 0) return -1;
+	int count = OS.g_list_length (list);
+	OS.g_list_free (list);
+	for (int i=0; i<count; i++) {
+		if (items [i] == item) return i;
+	}
+	return -1;
+}
+
+Point minimumSize (int wHint, int hHint, boolean flushCache) {
+	Control [] children = _getChildren ();
+	int width = 0, height = 0;
+	for (int i=0; i<children.length; i++) {
+		Control child = children [i];
+		int index = 0;
+		int count = 0;
+		int list = OS.gtk_container_get_children (handle);
+		if (list != 0) {
+			count = OS.g_list_length (list);
+			OS.g_list_free (list);
+		}
+		while (index < count) {
+			if (items [index].control == child) break;
+			index++;
+		}
+		if (index == count) {
+			Rectangle rect = child.getBounds ();
+			width = Math.max (width, rect.x + rect.width);
+			height = Math.max (height, rect.y + rect.height);
+		} else {
+			Point size = child.computeSize (wHint, hHint, flushCache);
+			width = Math.max (width, size.x);
+			height = Math.max (height, size.y);
+		}
+	}
+	return new Point (width, height);
+}
+
+void releaseWidget () {
+	int count = getItemCount ();
+	for (int i=0; i<count; i++) {
+		TabItem item = items [i];
+		if (!item.isDisposed ()) item.releaseResources ();
+	}
+	items = null;
+	super.releaseWidget ();
+}
+
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when the receiver's selection changes.
@@ -512,49 +512,49 @@ void releaseWidget () {
  * @see SelectionListener
  * @see #addSelectionListener
  */
-public void removeSelectionListener (SelectionListener listener) {

-	checkWidget ();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Selection, listener);

-	eventTable.unhook (SWT.DefaultSelection,listener);	

-}

-

-boolean setBounds (int x, int y, int width, int height, boolean move, boolean resize) {

-	boolean changed = super.setBounds (x, y, width, height, move, resize);

-	if (changed && resize) {

-		int index = getSelectionIndex ();

-		if (index != -1) {

-			TabItem item = items [index];

-			Control control = item.control;

-			if (control != null && !control.isDisposed ()) {

-				control.setBounds (getClientArea ());

-			}

-		}

-	}

-	return changed;

-}

-

-void setFontDescription (int font) {

-	super.setFontDescription (font);

-	TabItem [] items = getItems ();

-	for (int i = 0; i < items.length; i++) {

-		if (items[i] != null) {

-			items[i].setFontDescription (font);

-		}

-	}

-}

-

-void setForegroundColor (GdkColor color) {

-	super.setForegroundColor (color);

-	TabItem [] items = getItems ();

-	for (int i = 0; i < items.length; i++) {

-		if (items[i] != null) {

-			items[i].setForegroundColor (color);

-		}

-	}

-}

-

+public void removeSelectionListener (SelectionListener listener) {
+	checkWidget ();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Selection, listener);
+	eventTable.unhook (SWT.DefaultSelection,listener);	
+}
+
+boolean setBounds (int x, int y, int width, int height, boolean move, boolean resize) {
+	boolean changed = super.setBounds (x, y, width, height, move, resize);
+	if (changed && resize) {
+		int index = getSelectionIndex ();
+		if (index != -1) {
+			TabItem item = items [index];
+			Control control = item.control;
+			if (control != null && !control.isDisposed ()) {
+				control.setBounds (getClientArea ());
+			}
+		}
+	}
+	return changed;
+}
+
+void setFontDescription (int font) {
+	super.setFontDescription (font);
+	TabItem [] items = getItems ();
+	for (int i = 0; i < items.length; i++) {
+		if (items[i] != null) {
+			items[i].setFontDescription (font);
+		}
+	}
+}
+
+void setForegroundColor (GdkColor color) {
+	super.setForegroundColor (color);
+	TabItem [] items = getItems ();
+	for (int i = 0; i < items.length; i++) {
+		if (items[i] != null) {
+			items[i].setForegroundColor (color);
+		}
+	}
+}
+
 /**
  * Selects the item at the given zero-relative index in the receiver. 
  * If the item at the index was already selected, it remains selected.
@@ -568,40 +568,40 @@ void setForegroundColor (GdkColor color) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setSelection (int index) {

-	checkWidget ();

-	setSelection (index, false);

-}

-

-void setSelection (int index, boolean notify) {

-	if (index < 0) return;

-	int oldIndex = OS.gtk_notebook_get_current_page (handle);

-	if (oldIndex != -1) {

-		TabItem item = items [oldIndex];

-		Control control = item.control;

-		if (control != null && !control.isDisposed ()) {

-			control.setVisible (false);

-		}

-	}

-	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	OS.gtk_notebook_set_current_page (handle, index);

-	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);

-	int newIndex = OS.gtk_notebook_get_current_page (handle);

-	if (newIndex != -1) {

-		TabItem item = items [newIndex];

-		Control control = item.control;

-		if (control != null && !control.isDisposed ()) {

-			control.setBounds (getClientArea ());

-			control.setVisible (true);

-		}

-		if (notify) {

-			Event event = new Event ();

-			event.item = item;

-			sendEvent (SWT.Selection, event);

-		}

-	}

-}

-

+public void setSelection (int index) {
+	checkWidget ();
+	setSelection (index, false);
+}
+
+void setSelection (int index, boolean notify) {
+	if (index < 0) return;
+	int oldIndex = OS.gtk_notebook_get_current_page (handle);
+	if (oldIndex != -1) {
+		TabItem item = items [oldIndex];
+		Control control = item.control;
+		if (control != null && !control.isDisposed ()) {
+			control.setVisible (false);
+		}
+	}
+	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	OS.gtk_notebook_set_current_page (handle, index);
+	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
+	int newIndex = OS.gtk_notebook_get_current_page (handle);
+	if (newIndex != -1) {
+		TabItem item = items [newIndex];
+		Control control = item.control;
+		if (control != null && !control.isDisposed ()) {
+			control.setBounds (getClientArea ());
+			control.setVisible (true);
+		}
+		if (notify) {
+			Event event = new Event ();
+			event.item = item;
+			sendEvent (SWT.Selection, event);
+		}
+	}
+}
+
 /**
  * Sets the receiver's selection to be the given array of items.
  * The current selected is first cleared, then the new items are
@@ -614,17 +614,17 @@ void setSelection (int index, boolean notify) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setSelection (TabItem [] items) {

-	checkWidget();

-	if (items == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (items.length == 0) {

-		setSelection (-1);

-		return;

-	}

-	for (int i=items.length-1; i>=0; --i) {

-		int index = indexOf (items [i]);

-		if (index != -1) setSelection (index);

-	}

-}

-

-}

+public void setSelection (TabItem [] items) {
+	checkWidget();
+	if (items == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (items.length == 0) {
+		setSelection (-1);
+		return;
+	}
+	for (int i=items.length-1; i>=0; --i) {
+		int index = indexOf (items [i]);
+		if (index != -1) setSelection (index);
+	}
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
index 4d97d71115..b1b55d03c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
@@ -1,17 +1,17 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+
 /**
  * Instances of this class represent a selectable user interface object
  * corresponding to a tab for a page in a tab folder.
@@ -25,12 +25,12 @@ import org.eclipse.swt.graphics.*;
  * IMPORTANT: This class is <em>not</em> intended to be subclassed.
  * </p>
  */
-public class TabItem extends Item {

-	int labelHandle, imageHandle, pageHandle;

-	Control control;

-	TabFolder parent;

-	String toolTipText;

-

+public class TabItem extends Item {
+	int labelHandle, imageHandle, pageHandle;
+	Control control;
+	TabFolder parent;
+	String toolTipText;
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>TabFolder</code>) and a style value
@@ -61,12 +61,12 @@ public class TabItem extends Item {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TabItem (TabFolder parent, int style) {

-	super (parent, style);

-	this.parent = parent;

-	parent.createItem (this, parent.getItemCount ());

-}

-

+public TabItem (TabFolder parent, int style) {
+	super (parent, style);
+	this.parent = parent;
+	parent.createItem (this, parent.getItemCount ());
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>TabFolder</code>), a style value
@@ -98,12 +98,12 @@ public TabItem (TabFolder parent, int style) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TabItem (TabFolder parent, int style, int index) {

-	super (parent, style);

-	this.parent = parent;

-	parent.createItem (this, index);

-}

-

+public TabItem (TabFolder parent, int style, int index) {
+	super (parent, style);
+	this.parent = parent;
+	parent.createItem (this, index);
+}
+
 /**
  * Returns the control that is used to fill the client area of
  * the tab folder when the user selects the tab item.  If no
@@ -116,17 +116,17 @@ public TabItem (TabFolder parent, int style, int index) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Control getControl () {

-	checkWidget ();

-	return control;

-}

-

-public Display getDisplay () {

-	TabFolder parent = this.parent;

-	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);

-	return parent.getDisplay ();

-}

-

+public Control getControl () {
+	checkWidget ();
+	return control;
+}
+
+public Display getDisplay () {
+	TabFolder parent = this.parent;
+	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);
+	return parent.getDisplay ();
+}
+
 /**
  * Returns the receiver's parent, which must be a <code>TabFolder</code>.
  *
@@ -137,11 +137,11 @@ public Display getDisplay () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public TabFolder getParent () {

-	checkWidget ();

-	return parent;

-}

-

+public TabFolder getParent () {
+	checkWidget ();
+	return parent;
+}
+
 /**
  * Returns the receiver's tool tip text, or null if it has
  * not been set.
@@ -153,30 +153,30 @@ public TabFolder getParent () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public String getToolTipText () {

-	checkWidget ();

-	return toolTipText;

-}

-

-void releaseChild () {

-	super.releaseChild ();

-	int index = parent.indexOf (this);

-	if (index == parent.getSelectionIndex ()) {

-		if (control != null) control.setVisible (false);

-	}

-	parent.destroyItem (this);

-}

-

-void releaseHandle () {

-	super.releaseHandle ();

-	pageHandle = labelHandle = imageHandle = 0;

-}

-

-void releaseWidget () {

-	super.releaseWidget ();

-	parent = null;

-}

-

+public String getToolTipText () {
+	checkWidget ();
+	return toolTipText;
+}
+
+void releaseChild () {
+	super.releaseChild ();
+	int index = parent.indexOf (this);
+	if (index == parent.getSelectionIndex ()) {
+		if (control != null) control.setVisible (false);
+	}
+	parent.destroyItem (this);
+}
+
+void releaseHandle () {
+	super.releaseHandle ();
+	pageHandle = labelHandle = imageHandle = 0;
+}
+
+void releaseWidget () {
+	super.releaseWidget ();
+	parent = null;
+}
+
 /**
  * Sets the control that is used to fill the client area of
  * the tab folder when the user selects the tab item.
@@ -192,60 +192,60 @@ void releaseWidget () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setControl (Control control) {

-	checkWidget ();

-	Control oldControl = this.control, newControl = control;

-	this.control = control;

-	int index = parent.indexOf (this);

-	if (index != parent.getSelectionIndex ()) {

-		if (newControl != null) newControl.setVisible (false);

-		return;

-	}

-	if (newControl != null) {

-		newControl.setBounds (parent.getClientArea ());

-		newControl.setVisible (true);

-	}

-	if (oldControl != null) oldControl.setVisible (false);

-}

-

-void setFontDescription (int font) {

-	OS.gtk_widget_modify_font (labelHandle, font);

-	OS.gtk_widget_modify_font (imageHandle, font);

-}

-

-void setForegroundColor (GdkColor color) {

-	OS.gtk_widget_modify_fg (labelHandle, 0, color);

-	OS.gtk_widget_modify_fg (imageHandle, 0, color);

-}

-

-public void setImage (Image image) {

-	checkWidget ();

-	super.setImage (image);

-	if (image != null) {

-		OS.gtk_image_set_from_pixmap (imageHandle, image.pixmap, image.mask);

-		OS.gtk_widget_show (imageHandle);

-	} else {

-		OS.gtk_image_set_from_pixmap (imageHandle, 0, 0);

-		OS.gtk_widget_hide (imageHandle);

-	}

-	parent.fixPage ();

-}

-

-public void setText (String string) {

-	checkWidget ();

-	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

-	super.setText (string);

-	char [] chars = fixMnemonic (string);

-	byte [] buffer = Converter.wcsToMbcs (null, chars, false);

-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);

-	if (string.length () != 0) {

-		OS.gtk_widget_show (labelHandle);

-	} else {

-		OS.gtk_widget_hide (labelHandle);

-	}

-	parent.fixPage ();

-}

-

+public void setControl (Control control) {
+	checkWidget ();
+	Control oldControl = this.control, newControl = control;
+	this.control = control;
+	int index = parent.indexOf (this);
+	if (index != parent.getSelectionIndex ()) {
+		if (newControl != null) newControl.setVisible (false);
+		return;
+	}
+	if (newControl != null) {
+		newControl.setBounds (parent.getClientArea ());
+		newControl.setVisible (true);
+	}
+	if (oldControl != null) oldControl.setVisible (false);
+}
+
+void setFontDescription (int font) {
+	OS.gtk_widget_modify_font (labelHandle, font);
+	OS.gtk_widget_modify_font (imageHandle, font);
+}
+
+void setForegroundColor (GdkColor color) {
+	OS.gtk_widget_modify_fg (labelHandle, 0, color);
+	OS.gtk_widget_modify_fg (imageHandle, 0, color);
+}
+
+public void setImage (Image image) {
+	checkWidget ();
+	super.setImage (image);
+	if (image != null) {
+		OS.gtk_image_set_from_pixmap (imageHandle, image.pixmap, image.mask);
+		OS.gtk_widget_show (imageHandle);
+	} else {
+		OS.gtk_image_set_from_pixmap (imageHandle, 0, 0);
+		OS.gtk_widget_hide (imageHandle);
+	}
+	parent.fixPage ();
+}
+
+public void setText (String string) {
+	checkWidget ();
+	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
+	super.setText (string);
+	char [] chars = fixMnemonic (string);
+	byte [] buffer = Converter.wcsToMbcs (null, chars, false);
+	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	if (string.length () != 0) {
+		OS.gtk_widget_show (labelHandle);
+	} else {
+		OS.gtk_widget_hide (labelHandle);
+	}
+	parent.fixPage ();
+}
+
 /**
  * Sets the receiver's tool tip text to the argument, which
  * may be null indicating that no tool tip text should be shown.
@@ -257,9 +257,9 @@ public void setText (String string) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setToolTipText (String string) {

-	checkWidget ();

-	toolTipText = string;

-}

-

-}

+public void setToolTipText (String string) {
+	checkWidget ();
+	toolTipText = string;
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
index dd18eebabf..e82690e095 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
@@ -259,8 +259,8 @@ public int indexOf (ToolItem item) {
 
 	// TEMPORARY CODE
 	ToolItem [] items = getItems ();
-	for (int i=0; i<items.length; i++) {

-		if (item == items[i]) return i;

+	for (int i=0; i<items.length; i++) {
+		if (item == items[i]) return i;
 	}
 	return -1;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
index 66fd6cf59e..62f8bea8fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
@@ -1,46 +1,46 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.events.*;

-

-/**

- *  Instances of this class implement rubber banding rectangles that are

- *  drawn onto a parent <code>Composite</code> or <code>Display</code>.

- *  These rectangles can be specified to respond to mouse and key events

- *  by either moving or resizing themselves accordingly.  Trackers are

- *  typically used to represent window geometries in a lightweight manner.

- *  

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>LEFT, RIGHT, UP, DOWN, RESIZE</dd>

- * <dt><b>Events:</b></dt>

- * <dd>Move, Resize</dd>

- * </dl>

- * <p>

- * Note: Rectangle move behavior is assumed unless RESIZE is specified.

- * </p><p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

- */

-public class Tracker extends Widget {

-	Composite parent;

-	Display display;

-	int cursor, lastCursor;

-	boolean tracking, stippled;

-	Rectangle [] rectangles = new Rectangle [0];

-	int xWindow;

-	int ptrGrabResult;

-	

-

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.events.*;
+
+/**
+ *  Instances of this class implement rubber banding rectangles that are
+ *  drawn onto a parent <code>Composite</code> or <code>Display</code>.
+ *  These rectangles can be specified to respond to mouse and key events
+ *  by either moving or resizing themselves accordingly.  Trackers are
+ *  typically used to represent window geometries in a lightweight manner.
+ *  
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>LEFT, RIGHT, UP, DOWN, RESIZE</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>Move, Resize</dd>
+ * </dl>
+ * <p>
+ * Note: Rectangle move behavior is assumed unless RESIZE is specified.
+ * </p><p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
+ */
+public class Tracker extends Widget {
+	Composite parent;
+	Display display;
+	int cursor, lastCursor;
+	boolean tracking, stippled;
+	Rectangle [] rectangles = new Rectangle [0];
+	int xWindow;
+	int ptrGrabResult;
+	
+
 /**
  * Constructs a new instance of this class given its parent
  * and a style value describing its behavior and appearance.
@@ -73,13 +73,13 @@ public class Tracker extends Widget {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public Tracker (Composite parent, int style) {

-	super (parent, checkStyle(style));

-	this.parent = parent;

-	display = parent.getDisplay ();

-	xWindow = calculateWindow();

-}

-

+public Tracker (Composite parent, int style) {
+	super (parent, checkStyle(style));
+	this.parent = parent;
+	display = parent.getDisplay ();
+	xWindow = calculateWindow();
+}
+
 /**
  * Constructs a new instance of this class given the display
  * to create it on and a style value describing its behavior
@@ -114,115 +114,115 @@ public Tracker (Composite parent, int style) {
  * @see SWT#UP
  * @see SWT#DOWN
  */
-public Tracker (Display display, int style) {

-	if (display == null) display = Display.getCurrent ();

-	if (display == null) display = Display.getDefault ();

-	if (!display.isValidThread ()) {

-		error (SWT.ERROR_THREAD_INVALID_ACCESS);

-	}

-	this.style = checkStyle (style);

-	this.display = display;

-	xWindow = calculateWindow();

-}

-

-

-/*

- *   ===  ADD / REMOVE LISTENERS  ===

- */

-

-/**

- * Adds the listener to the collection of listeners who will

- * be notified when the control is moved or resized, by sending

- * it one of the messages defined in the <code>ControlListener</code>

- * interface.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ControlListener

- * @see #removeControlListener

+public Tracker (Display display, int style) {
+	if (display == null) display = Display.getCurrent ();
+	if (display == null) display = Display.getDefault ();
+	if (!display.isValidThread ()) {
+		error (SWT.ERROR_THREAD_INVALID_ACCESS);
+	}
+	this.style = checkStyle (style);
+	this.display = display;
+	xWindow = calculateWindow();
+}
+
+
+/*
+ *   ===  ADD / REMOVE LISTENERS  ===
  */
-public void addControlListener(ControlListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	TypedListener typedListener = new TypedListener (listener);

-	addListener (SWT.Move,typedListener);

-}

-

-/**

- * Removes the listener from the collection of listeners who will

- * be notified when the control is moved or resized.

- *

- * @param listener the listener which should be notified

- *

- * @exception IllegalArgumentException <ul>

- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>

- * </ul>

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- *

- * @see ControlListener

- * @see #addControlListener

+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control is moved or resized, by sending
+ * it one of the messages defined in the <code>ControlListener</code>
+ * interface.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ControlListener
+ * @see #removeControlListener
  */
-public void removeControlListener (ControlListener listener) {

-	checkWidget();

-	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

-	if (eventTable == null) return;

-	eventTable.unhook (SWT.Move, listener);

-}

-

-

-

-

-/*

- *   ===  PUBLIC ACCESSORS  ===

- */

-

-public Display getDisplay () {

-	return display;

-}

-

-/**

- * Returns the bounds that are being drawn, expressed relative to the parent

- * widget.  If the parent is a <code>Display</code> then these are screen

- * coordinates.

- *

- * @return the bounds of the Rectangles being drawn

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public void addControlListener(ControlListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	TypedListener typedListener = new TypedListener (listener);
+	addListener (SWT.Move,typedListener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control is moved or resized.
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see ControlListener
+ * @see #addControlListener
+ */
+public void removeControlListener (ControlListener listener) {
+	checkWidget();
+	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (eventTable == null) return;
+	eventTable.unhook (SWT.Move, listener);
+}
+
+
+
+
+/*
+ *   ===  PUBLIC ACCESSORS  ===
+ */
+
+public Display getDisplay () {
+	return display;
+}
+
+/**
+ * Returns the bounds that are being drawn, expressed relative to the parent
+ * widget.  If the parent is a <code>Display</code> then these are screen
+ * coordinates.
+ *
+ * @return the bounds of the Rectangles being drawn
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public Rectangle [] getRectangles () {

-	checkWidget();

-	return rectangles;

-}

-

-/**

- * Returns <code>true</code> if the rectangles are drawn with a stippled line, <code>false</code> otherwise.

- *

- * @return the stippled effect of the rectangles

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public Rectangle [] getRectangles () {
+	checkWidget();
+	return rectangles;
+}
+
+/**
+ * Returns <code>true</code> if the rectangles are drawn with a stippled line, <code>false</code> otherwise.
+ *
+ * @return the stippled effect of the rectangles
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public boolean getStippled () {

-	checkWidget();

-	return stippled;

-}

-

+public boolean getStippled () {
+	checkWidget();
+	return stippled;
+}
+
 /**
  * Specifies the rectangles that should be drawn, expressed relative to the parent
  * widget.  If the parent is a Display then these are screen coordinates.
@@ -234,207 +234,207 @@ public boolean getStippled () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setRectangles (Rectangle [] rectangles) {

-	checkWidget();

-	this.rectangles = rectangles;

-}

-

-/**

- * Changes the appearance of the line used to draw the rectangles.

- *

- * @param stippled <code>true</code> if rectangle should appear stippled

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public void setRectangles (Rectangle [] rectangles) {
+	checkWidget();
+	this.rectangles = rectangles;
+}
+
+/**
+ * Changes the appearance of the line used to draw the rectangles.
+ *
+ * @param stippled <code>true</code> if rectangle should appear stippled
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void setStippled (boolean stippled) {
+	checkWidget();
+	this.stippled = stippled;
+}
+
+
+
+/*
+ *   ===  PUBLIC FUNCTIONALITY  ===
+ */
+
+/**
+ * Stops displaying the tracker rectangles.  Note that this is not considered
+ * to be a cancelation by the user.
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void close () {
+	checkWidget();
+	tracking = false;
+}
+
+/**
+ * Displays the Tracker rectangles for manipulation by the user.  Returns when
+ * the user has either finished manipulating the rectangles or has cancelled the
+ * Tracker.
+ * 
+ * @return <code>true</code> if the user did not cancel the Tracker, <code>false</code> otherwise
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public boolean open () {
+	checkWidget();
+	boolean cancelled=false;
+	tracking = true;
+	drawRectangles ();
+
+	int[] newX = new int[1];
+	int[] newY = new int[1];
+	int[] oldX = new int[1];
+	int[] oldY = new int[1];
+	OS.gdk_window_get_pointer(xWindow, oldX,oldY, null);
+	grab();
+
+	/*
+	 *  Tracker behaves like a Dialog with its own OS event loop.
+	 */
+	while (tracking) {
+		if (parent != null && parent.isDisposed ()) break;
+		// wait for an event		
+		int eventPtr;
+		while (true) {
+			eventPtr = OS.gdk_event_get();
+			if (eventPtr != 0) {
+				break;
+			} 
+			else {
+				try { Thread.sleep(50); } catch (Exception ex) {}
+			}
+		}
+
+		GdkEvent osEvent = new GdkEvent();
+		OS.memmove(osEvent, eventPtr, GdkEvent.sizeof);
+		int eventType = osEvent.type;
+		switch (eventType) {
+			case OS.GDK_BUTTON_RELEASE:
+			case OS.GDK_MOTION_NOTIFY:
+				if (cursor != lastCursor) { ungrab(); grab(); }
+				OS.gdk_window_get_pointer(xWindow, newX,newY, null);
+				if (oldX [0] != newX [0] || oldY [0] != newY [0]) {
+					drawRectangles ();
+					for (int i=0; i<rectangles.length; i++) {
+						rectangles [i].x += newX [0] - oldX [0];
+						rectangles [i].y += newY [0] - oldY [0];
+					}
+					Event event = new Event();
+					event.x = newX[0];
+					event.y = newY[0];
+					sendEvent (SWT.Move,event);
+					drawRectangles ();
+					oldX [0] = newX [0];  oldY [0] = newY [0];
+				}
+				tracking = (eventType != OS.GDK_BUTTON_RELEASE);
+				break;
+			case OS.GDK_KEY_PRESS:
+				GdkEventKey gdkEvent = new GdkEventKey ();
+				OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
+				switch (gdkEvent.keyval) {
+					case OS.GDK_Escape: 
+						cancelled = true;
+						// fallthrough
+					case OS.GDK_Return:
+						tracking = false;
+						break;
+				}
+				break;
+			}  // switch
+			OS.gdk_event_free(eventPtr);
+		}  // while
+	drawRectangles();
+	ungrab();
+	return !cancelled;
+}
+
+private void drawRectangles () {
+	if (parent != null) {
+		if (parent.isDisposed ()) return;
+		parent.getShell ().update ();
+	} else {
+		display.update ();
+	}
+	
+	int gc = OS.gdk_gc_new(xWindow);
+	if (gc==0) error(SWT.ERROR_UNSPECIFIED);
+
+	/* White foreground */
+	int colormap = OS.gdk_colormap_get_system();
+	GdkColor color = new GdkColor();
+	OS.gdk_color_white(colormap, color);
+	OS.gdk_gc_set_foreground(gc, color);
+
+	/* Draw on top of inferior widgets */
+	OS.gdk_gc_set_subwindow(gc, OS.GDK_INCLUDE_INFERIORS);
+	
+	/* XOR */
+	OS.gdk_gc_set_function(gc, OS.GDK_XOR);
+	
+	for (int i=0; i<rectangles.length; i++) {
+		Rectangle rect = rectangles [i];
+		OS.gdk_draw_rectangle(xWindow, gc, 0, rect.x, rect.y, rect.width, rect.height);
+	}
+	OS.g_object_unref(gc);
+}
+
+/*
+ * Figure which GdkWindow we'll draw on.
+ * That's normally the root X window, or the parent's GdkWindow if we have a parent.
+ */
+private int calculateWindow() {
+	int answer;
+	if (parent == null) answer = OS.GDK_ROOT_PARENT();
+		else answer = OS.GTK_WIDGET_WINDOW(parent.paintHandle());
+	if (answer==0) error(SWT.ERROR_UNSPECIFIED);
+	return answer;
+}
+
+/**
+ * Sets the <code>Cursor</code> of the Tracker.  If this cursor is <code>null</code>
+ * then the cursor reverts to the default.
+ *
+ * @param newCursor the new <code>Cursor</code> to display
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public void setStippled (boolean stippled) {

-	checkWidget();

-	this.stippled = stippled;

-}

-

-

-

-/*

- *   ===  PUBLIC FUNCTIONALITY  ===

- */

-

-/**

- * Stops displaying the tracker rectangles.  Note that this is not considered

- * to be a cancelation by the user.

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- */

-public void close () {

-	checkWidget();

-	tracking = false;

-}

-

-/**

- * Displays the Tracker rectangles for manipulation by the user.  Returns when

- * the user has either finished manipulating the rectangles or has cancelled the

- * Tracker.

- * 

- * @return <code>true</code> if the user did not cancel the Tracker, <code>false</code> otherwise

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- */

-public boolean open () {

-	checkWidget();

-	boolean cancelled=false;

-	tracking = true;

-	drawRectangles ();

-

-	int[] newX = new int[1];

-	int[] newY = new int[1];

-	int[] oldX = new int[1];

-	int[] oldY = new int[1];

-	OS.gdk_window_get_pointer(xWindow, oldX,oldY, null);

-	grab();

-

-	/*

-	 *  Tracker behaves like a Dialog with its own OS event loop.

-	 */

-	while (tracking) {

-		if (parent != null && parent.isDisposed ()) break;

-		// wait for an event		

-		int eventPtr;

-		while (true) {

-			eventPtr = OS.gdk_event_get();

-			if (eventPtr != 0) {

-				break;

-			} 

-			else {

-				try { Thread.sleep(50); } catch (Exception ex) {}

-			}

-		}

-

-		GdkEvent osEvent = new GdkEvent();

-		OS.memmove(osEvent, eventPtr, GdkEvent.sizeof);

-		int eventType = osEvent.type;

-		switch (eventType) {

-			case OS.GDK_BUTTON_RELEASE:

-			case OS.GDK_MOTION_NOTIFY:

-				if (cursor != lastCursor) { ungrab(); grab(); }

-				OS.gdk_window_get_pointer(xWindow, newX,newY, null);

-				if (oldX [0] != newX [0] || oldY [0] != newY [0]) {

-					drawRectangles ();

-					for (int i=0; i<rectangles.length; i++) {

-						rectangles [i].x += newX [0] - oldX [0];

-						rectangles [i].y += newY [0] - oldY [0];

-					}

-					Event event = new Event();

-					event.x = newX[0];

-					event.y = newY[0];

-					sendEvent (SWT.Move,event);

-					drawRectangles ();

-					oldX [0] = newX [0];  oldY [0] = newY [0];

-				}

-				tracking = (eventType != OS.GDK_BUTTON_RELEASE);

-				break;

-			case OS.GDK_KEY_PRESS:

-				GdkEventKey gdkEvent = new GdkEventKey ();

-				OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);

-				switch (gdkEvent.keyval) {

-					case OS.GDK_Escape: 

-						cancelled = true;

-						// fallthrough

-					case OS.GDK_Return:

-						tracking = false;

-						break;

-				}

-				break;

-			}  // switch

-			OS.gdk_event_free(eventPtr);

-		}  // while

-	drawRectangles();

-	ungrab();

-	return !cancelled;

-}

-

-private void drawRectangles () {

-	if (parent != null) {

-		if (parent.isDisposed ()) return;

-		parent.getShell ().update ();

-	} else {

-		display.update ();

-	}

-	

-	int gc = OS.gdk_gc_new(xWindow);

-	if (gc==0) error(SWT.ERROR_UNSPECIFIED);

-

-	/* White foreground */

-	int colormap = OS.gdk_colormap_get_system();

-	GdkColor color = new GdkColor();

-	OS.gdk_color_white(colormap, color);

-	OS.gdk_gc_set_foreground(gc, color);

-

-	/* Draw on top of inferior widgets */

-	OS.gdk_gc_set_subwindow(gc, OS.GDK_INCLUDE_INFERIORS);

-	

-	/* XOR */

-	OS.gdk_gc_set_function(gc, OS.GDK_XOR);

-	

-	for (int i=0; i<rectangles.length; i++) {

-		Rectangle rect = rectangles [i];

-		OS.gdk_draw_rectangle(xWindow, gc, 0, rect.x, rect.y, rect.width, rect.height);

-	}

-	OS.g_object_unref(gc);

-}

-

-/*

- * Figure which GdkWindow we'll draw on.

- * That's normally the root X window, or the parent's GdkWindow if we have a parent.

- */

-private int calculateWindow() {

-	int answer;

-	if (parent == null) answer = OS.GDK_ROOT_PARENT();

-		else answer = OS.GTK_WIDGET_WINDOW(parent.paintHandle());

-	if (answer==0) error(SWT.ERROR_UNSPECIFIED);

-	return answer;

-}

-

-/**

- * Sets the <code>Cursor</code> of the Tracker.  If this cursor is <code>null</code>

- * then the cursor reverts to the default.

- *

- * @param newCursor the new <code>Cursor</code> to display

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- */

-public void setCursor (Cursor value) {

-	checkWidget ();

-	cursor = 0;

-	if (value != null) cursor = value.handle;

-}

-void grab() {

-	ptrGrabResult = OS.gdk_pointer_grab(xWindow,

-	                                    false,

-	                                    OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK,

-	                                    xWindow,

-	                                    cursor,

-	                                    OS.GDK_CURRENT_TIME);

-	lastCursor = cursor;

-}

-void ungrab() {

-	if (ptrGrabResult == OS.GDK_GRAB_SUCCESS)

-		OS.gdk_pointer_ungrab(OS.GDK_CURRENT_TIME);

-

-}

-static int checkStyle (int style) {

-	if ((style & (SWT.LEFT | SWT.RIGHT | SWT.UP | SWT.DOWN)) == 0) {

-		style |= SWT.LEFT | SWT.RIGHT | SWT.UP | SWT.DOWN;

-	}

-	return style;

-}

-}

+public void setCursor (Cursor value) {
+	checkWidget ();
+	cursor = 0;
+	if (value != null) cursor = value.handle;
+}
+void grab() {
+	ptrGrabResult = OS.gdk_pointer_grab(xWindow,
+	                                    false,
+	                                    OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK,
+	                                    xWindow,
+	                                    cursor,
+	                                    OS.GDK_CURRENT_TIME);
+	lastCursor = cursor;
+}
+void ungrab() {
+	if (ptrGrabResult == OS.GDK_GRAB_SUCCESS)
+		OS.gdk_pointer_ungrab(OS.GDK_CURRENT_TIME);
+
+}
+static int checkStyle (int style) {
+	if ((style & (SWT.LEFT | SWT.RIGHT | SWT.UP | SWT.DOWN)) == 0) {
+		style |= SWT.LEFT | SWT.RIGHT | SWT.UP | SWT.DOWN;
+	}
+	return style;
+}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
index 862665c731..226329cb51 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
@@ -1,35 +1,35 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-import org.eclipse.swt.graphics.*;

-

-/**

- * Instances of this class represent a selectable user interface object

- * that represents a hierarchy of tree items in a tree widget.

- * 

- * <dl>

- * <dt><b>Styles:</b></dt>

- * <dd>(none)</dd>

- * <dt><b>Events:</b></dt>

- * <dd>(none)</dd>

- * </dl>

- * <p>

- * IMPORTANT: This class is <em>not</em> intended to be subclassed.

- * </p>

+ * http://www.eclipse.org/legal/cpl-v10.html
  */
-public class TreeItem extends Item {

-	Tree parent;

-	boolean grayed;

-

+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.graphics.*;
+
+/**
+ * Instances of this class represent a selectable user interface object
+ * that represents a hierarchy of tree items in a tree widget.
+ * 
+ * <dl>
+ * <dt><b>Styles:</b></dt>
+ * <dd>(none)</dd>
+ * <dt><b>Events:</b></dt>
+ * <dd>(none)</dd>
+ * </dl>
+ * <p>
+ * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * </p>
+ */
+public class TreeItem extends Item {
+	Tree parent;
+	boolean grayed;
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Tree</code> or a <code>TreeItem</code>)
@@ -60,12 +60,12 @@ public class TreeItem extends Item {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TreeItem (Tree parent, int style) {

-	super (parent, style);

-	this.parent = parent;

-	parent.createItem (this, 0, -1);

-}

-

+public TreeItem (Tree parent, int style) {
+	super (parent, style);
+	this.parent = parent;
+	parent.createItem (this, 0, -1);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Tree</code> or a <code>TreeItem</code>),
@@ -97,13 +97,13 @@ public TreeItem (Tree parent, int style) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TreeItem (Tree parent, int style, int index) {

-	super (parent, style);

-	if (index < 0) error (SWT.ERROR_INVALID_RANGE);

-	this.parent = parent;

-	parent.createItem (this, 0, index);

-}

-

+public TreeItem (Tree parent, int style, int index) {
+	super (parent, style);
+	if (index < 0) error (SWT.ERROR_INVALID_RANGE);
+	this.parent = parent;
+	parent.createItem (this, 0, index);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Tree</code> or a <code>TreeItem</code>)
@@ -134,12 +134,12 @@ public TreeItem (Tree parent, int style, int index) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TreeItem (TreeItem parentItem, int style) {

-	super (checkNull (parentItem).parent, style);

-	this.parent = parentItem.parent;

-	parent.createItem (this, parentItem.handle, -1);

-}

-

+public TreeItem (TreeItem parentItem, int style) {
+	super (checkNull (parentItem).parent, style);
+	this.parent = parentItem.parent;
+	parent.createItem (this, parentItem.handle, -1);
+}
+
 /**
  * Constructs a new instance of this class given its parent
  * (which must be a <code>Tree</code> or a <code>TreeItem</code>),
@@ -171,41 +171,41 @@ public TreeItem (TreeItem parentItem, int style) {
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
-public TreeItem (TreeItem parentItem, int style, int index) {

-	super (checkNull (parentItem).parent, style);

-	if (index < 0) error (SWT.ERROR_ITEM_NOT_ADDED);

-	this.parent = parentItem.parent;

-	parent.createItem (this, parentItem.handle, index);

-}

-

-static TreeItem checkNull (TreeItem item) {

-	if (item == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);

-	return item;

-}

-

-/**

- * Returns the receiver's background color.

- *

- * @return the background color

- * 

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @since 2.0

- * 

- */

-public Color getBackground () {

-	checkWidget ();

-	int[] ptr = new int[1];

-	OS.gtk_tree_model_get (parent.modelHandle, handle, 3, ptr, -1);

-	if (ptr [0] == 0) return parent.getBackground ();

-	GdkColor gdkColor = new GdkColor ();

-	OS.memmove (gdkColor, ptr [0], GdkColor.sizeof);

-	return Color.gtk_new (getDisplay (), gdkColor);

-}

-

+public TreeItem (TreeItem parentItem, int style, int index) {
+	super (checkNull (parentItem).parent, style);
+	if (index < 0) error (SWT.ERROR_ITEM_NOT_ADDED);
+	this.parent = parentItem.parent;
+	parent.createItem (this, parentItem.handle, index);
+}
+
+static TreeItem checkNull (TreeItem item) {
+	if (item == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+	return item;
+}
+
+/**
+ * Returns the receiver's background color.
+ *
+ * @return the background color
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @since 2.0
+ * 
+ */
+public Color getBackground () {
+	checkWidget ();
+	int[] ptr = new int[1];
+	OS.gtk_tree_model_get (parent.modelHandle, handle, 3, ptr, -1);
+	if (ptr [0] == 0) return parent.getBackground ();
+	GdkColor gdkColor = new GdkColor ();
+	OS.memmove (gdkColor, ptr [0], GdkColor.sizeof);
+	return Color.gtk_new (getDisplay (), gdkColor);
+}
+
 /**
  * Returns a rectangle describing the receiver's size and location
  * relative to its parent.
@@ -217,17 +217,17 @@ public Color getBackground () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Rectangle getBounds () {

-	checkWidget ();

-	int parentHandle = parent.handle;

-	GdkRectangle rect = new GdkRectangle ();

-	int column = OS.gtk_tree_view_get_column (parentHandle, 0);

-	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);

-	OS.gtk_tree_path_free (path);

-	return new Rectangle (rect.x, rect.y, rect.width, rect.height);

-}	

-

+public Rectangle getBounds () {
+	checkWidget ();
+	int parentHandle = parent.handle;
+	GdkRectangle rect = new GdkRectangle ();
+	int column = OS.gtk_tree_view_get_column (parentHandle, 0);
+	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	OS.gtk_tree_path_free (path);
+	return new Rectangle (rect.x, rect.y, rect.width, rect.height);
+}	
+
 /**
  * Returns <code>true</code> if the receiver is checked,
  * and false otherwise.  When the parent does not have
@@ -241,19 +241,19 @@ public Rectangle getBounds () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getChecked () {

-	checkWidget();

-	if ((parent.style & SWT.CHECK) == 0) return false;

-	int [] ptr = new int [1];

-	OS.gtk_tree_model_get (parent.modelHandle, handle, 5, ptr, -1);

-	return ptr [0] != 0;

-}

-

-public Display getDisplay () {

-	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);

-	return parent.getDisplay ();

-}

-

+public boolean getChecked () {
+	checkWidget();
+	if ((parent.style & SWT.CHECK) == 0) return false;
+	int [] ptr = new int [1];
+	OS.gtk_tree_model_get (parent.modelHandle, handle, 5, ptr, -1);
+	return ptr [0] != 0;
+}
+
+public Display getDisplay () {
+	if (parent == null) error (SWT.ERROR_WIDGET_DISPOSED);
+	return parent.getDisplay ();
+}
+
 /**
  * Returns <code>true</code> if the receiver is expanded,
  * and false otherwise.
@@ -266,37 +266,37 @@ public Display getDisplay () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getExpanded () {

-	checkWidget();

-	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

-	boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);

-	OS.gtk_tree_path_free (path);

-	return answer;

-}

-

-/**

- * Returns the foreground color that the receiver will use to draw.

- *

- * @return the receiver's foreground color

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

- * 

- * @since 2.0

- * 

+public boolean getExpanded () {
+	checkWidget();
+	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+	boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
+	OS.gtk_tree_path_free (path);
+	return answer;
+}
+
+/**
+ * Returns the foreground color that the receiver will use to draw.
+ *
+ * @return the receiver's foreground color
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * 
+ * @since 2.0
+ * 
  */
-public Color getForeground () {

-	checkWidget ();

-	int [] ptr = new int [1];

-	OS.gtk_tree_model_get (parent.modelHandle, handle, 2, ptr, -1);

-	if (ptr [0]==0) return parent.getForeground();

-	GdkColor gdkColor = new GdkColor ();

-	OS.memmove (gdkColor, ptr [0], GdkColor.sizeof);

-	return Color.gtk_new (getDisplay (), gdkColor);

-}

-

+public Color getForeground () {
+	checkWidget ();
+	int [] ptr = new int [1];
+	OS.gtk_tree_model_get (parent.modelHandle, handle, 2, ptr, -1);
+	if (ptr [0]==0) return parent.getForeground();
+	GdkColor gdkColor = new GdkColor ();
+	OS.memmove (gdkColor, ptr [0], GdkColor.sizeof);
+	return Color.gtk_new (getDisplay (), gdkColor);
+}
+
 /**
  * Returns <code>true</code> if the receiver is grayed,
  * and false otherwise. When the parent does not have
@@ -310,12 +310,12 @@ public Color getForeground () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public boolean getGrayed() {

-	checkWidget();

-	//NOT IMPLEMENTED

-	return grayed;

-}

-

+public boolean getGrayed() {
+	checkWidget();
+	//NOT IMPLEMENTED
+	return grayed;
+}
+
 /**
  * Returns the number of items contained in the receiver
  * that are direct item children of the receiver.
@@ -327,32 +327,32 @@ public boolean getGrayed() {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public int getItemCount () {

-	checkWidget();

-	return OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);

-}

-

-/**

- * Returns an array of <code>TreeItem</code>s which are the

- * direct item children of the receiver.

- * <p>

- * Note: This is not the actual structure used by the receiver

- * to maintain its list of items, so modifying the array will

- * not affect the receiver. 

- * </p>

- *

- * @return the receiver's items

- *

- * @exception SWTException <ul>

- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>

- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>

- * </ul>

+public int getItemCount () {
+	checkWidget();
+	return OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
+}
+
+/**
+ * Returns an array of <code>TreeItem</code>s which are the
+ * direct item children of the receiver.
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its list of items, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ *
+ * @return the receiver's items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
  */
-public TreeItem [] getItems () {

-	checkWidget();

-	return parent.getItems (handle);

-}

-

+public TreeItem [] getItems () {
+	checkWidget();
+	return parent.getItems (handle);
+}
+
 /**
  * Returns the receiver's parent, which must be a <code>Tree</code>.
  *
@@ -363,11 +363,11 @@ public TreeItem [] getItems () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public Tree getParent () {

-	checkWidget();

-	return parent;

-}

-

+public Tree getParent () {
+	checkWidget();
+	return parent;
+}
+
 /**
  * Returns the receiver's parent item, which must be a
  * <code>TreeItem</code> or null when the receiver is a
@@ -380,35 +380,35 @@ public Tree getParent () {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public TreeItem getParentItem () {

-	checkWidget();

-	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

-	if (OS.gtk_tree_path_get_depth (path) < 2) {

-		OS.gtk_tree_path_free (path);

-		return null;

-	}

-	OS.gtk_tree_path_up (path);

-	int iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());

-	OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path);

-	int [] index = new int [1];

-	OS.gtk_tree_model_get (parent.modelHandle, iter, 4, index, -1);

-	OS.g_free (iter);

-	OS.gtk_tree_path_free (path);

-	return parent.items [index [0]];

-}

-

-void releaseChild () {

-	super.releaseChild ();

-	parent.destroyItem (this);

-}

-

-void releaseWidget () {

-	super.releaseWidget ();

-	if (handle != 0) OS.g_free (handle);

-	handle = 0;

-	parent = null;

-}

-

+public TreeItem getParentItem () {
+	checkWidget();
+	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+	if (OS.gtk_tree_path_get_depth (path) < 2) {
+		OS.gtk_tree_path_free (path);
+		return null;
+	}
+	OS.gtk_tree_path_up (path);
+	int iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path);
+	int [] index = new int [1];
+	OS.gtk_tree_model_get (parent.modelHandle, iter, 4, index, -1);
+	OS.g_free (iter);
+	OS.gtk_tree_path_free (path);
+	return parent.items [index [0]];
+}
+
+void releaseChild () {
+	super.releaseChild ();
+	parent.destroyItem (this);
+}
+
+void releaseWidget () {
+	super.releaseWidget ();
+	if (handle != 0) OS.g_free (handle);
+	handle = 0;
+	parent = null;
+}
+
 /**
  * Sets the receiver's background color to the color specified
  * by the argument, or to the default system color for the item
@@ -427,15 +427,15 @@ void releaseWidget () {
  * @since 2.0
  * 
  */
-public void setBackground (Color color) {

-	checkWidget ();

-	if (color != null && color.isDisposed ()) {

-		SWT.error (SWT.ERROR_INVALID_ARGUMENT);

-	}

-	GdkColor gdkColor = color != null ? color.handle : null;

-	OS.gtk_tree_store_set (parent.modelHandle, handle, 3, gdkColor, -1);

-}

-

+public void setBackground (Color color) {
+	checkWidget ();
+	if (color != null && color.isDisposed ()) {
+		SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+	}
+	GdkColor gdkColor = color != null ? color.handle : null;
+	OS.gtk_tree_store_set (parent.modelHandle, handle, 3, gdkColor, -1);
+}
+
 /**
  * Sets the checked state of the receiver.
  * <p>
@@ -447,12 +447,12 @@ public void setBackground (Color color) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setChecked (boolean checked) {

-	checkWidget();

-	if ((parent.style & SWT.CHECK) == 0) return;

-	OS.gtk_tree_store_set (parent.modelHandle, handle, 5, checked, -1);

-}

-

+public void setChecked (boolean checked) {
+	checkWidget();
+	if ((parent.style & SWT.CHECK) == 0) return;
+	OS.gtk_tree_store_set (parent.modelHandle, handle, 5, checked, -1);
+}
+
 /**
  * Sets the grayed state of the receiver.
  * <p>
@@ -464,12 +464,12 @@ public void setChecked (boolean checked) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setGrayed (boolean grayed) {

-	checkWidget();

-	//NOT IMPLEMENTED

-	this.grayed = grayed;

-}

-

+public void setGrayed (boolean grayed) {
+	checkWidget();
+	//NOT IMPLEMENTED
+	this.grayed = grayed;
+}
+
 /**
  * Sets the expanded state of the receiver.
  * <p>
@@ -481,21 +481,21 @@ public void setGrayed (boolean grayed) {
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
-public void setExpanded (boolean expanded) {

-	checkWidget();

-	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);

-	if (expanded) {

-		OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_EXPANDED);

-		OS.gtk_tree_view_expand_row (parent.handle, path, false);

-		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_EXPANDED);

-	} else {

-		OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_COLLAPSED);

-		OS.gtk_tree_view_collapse_row (parent.handle, path);

-		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_COLLAPSED);

-	}

-	OS.gtk_tree_path_free (path);

-}

-

+public void setExpanded (boolean expanded) {
+	checkWidget();
+	int path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+	if (expanded) {
+		OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_EXPANDED);
+		OS.gtk_tree_view_expand_row (parent.handle, path, false);
+		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_EXPANDED);
+	} else {
+		OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_COLLAPSED);
+		OS.gtk_tree_view_collapse_row (parent.handle, path);
+		OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ROW_COLLAPSED);
+	}
+	OS.gtk_tree_path_free (path);
+}
+
 /**
  * Sets the receiver's foreground color to the color specified
  * by the argument, or to the default system color for the item
@@ -516,43 +516,43 @@ public void setExpanded (boolean expanded) {
  * @since 2.0
  * 
  */
-public void setForeground (Color color){

-	checkWidget ();

-	if (color != null && color.isDisposed ()) {

-		SWT.error (SWT.ERROR_INVALID_ARGUMENT);

-	}

-	GdkColor gdkColor = color != null ? color.handle : null;

-	OS.gtk_tree_store_set (parent.modelHandle, handle, 2, gdkColor, -1);

-}

-

-public void setImage (Image image) {

-	checkWidget();

-	if (image != null && image.isDisposed()) {

-		error(SWT.ERROR_INVALID_ARGUMENT);

-	}

-	super.setImage (image);

-	int pixbuf = 0;

-	if (image != null) {

-		ImageList imageList = parent.imageList;

-		if (imageList == null) imageList = parent.imageList = new ImageList ();

-		int imageIndex = imageList.indexOf (image);

-		if (imageIndex == -1) imageIndex = imageList.add (image);

-		pixbuf = imageList.getPixbuf (imageIndex);

-	}

-	OS.gtk_tree_store_set (parent.modelHandle, handle, 1, pixbuf, -1);

-}

-

+public void setForeground (Color color){
+	checkWidget ();
+	if (color != null && color.isDisposed ()) {
+		SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+	}
+	GdkColor gdkColor = color != null ? color.handle : null;
+	OS.gtk_tree_store_set (parent.modelHandle, handle, 2, gdkColor, -1);
+}
+
+public void setImage (Image image) {
+	checkWidget();
+	if (image != null && image.isDisposed()) {
+		error(SWT.ERROR_INVALID_ARGUMENT);
+	}
+	super.setImage (image);
+	int pixbuf = 0;
+	if (image != null) {
+		ImageList imageList = parent.imageList;
+		if (imageList == null) imageList = parent.imageList = new ImageList ();
+		int imageIndex = imageList.indexOf (image);
+		if (imageIndex == -1) imageIndex = imageList.add (image);
+		pixbuf = imageList.getPixbuf (imageIndex);
+	}
+	OS.gtk_tree_store_set (parent.modelHandle, handle, 1, pixbuf, -1);
+}
+
 /**
  * This label will be displayed to the right of the bitmap, 
  * or, if the receiver doesn't have a bitmap to the right of 
  * the horizontal hierarchy connector line.
  */
-public void setText (String string) {

-	checkWidget();

-	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);

-	super.setText (string);

-	byte[] buffer = Converter.wcsToMbcs (null, string, true);

-	OS.gtk_tree_store_set (parent.modelHandle, handle, 0, buffer, -1);

-}

-

-}

+public void setText (String string) {
+	checkWidget();
+	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
+	super.setText (string);
+	byte[] buffer = Converter.wcsToMbcs (null, string, true);
+	OS.gtk_tree_store_set (parent.modelHandle, handle, 0, buffer, -1);
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/WidgetTable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/WidgetTable.java
index 91b7a1e07a..0f0bc86331 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/WidgetTable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/WidgetTable.java
@@ -1,103 +1,103 @@
-package org.eclipse.swt.widgets;

-

-/*

+package org.eclipse.swt.widgets;
+
+/*
  * Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
  * This file is made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html

- */

- 

-import org.eclipse.swt.internal.*;

-import org.eclipse.swt.internal.gtk.*;

-

-class WidgetTable {

-	static int FreeSlot = 0;

-	static int GrowSize = 1024;

-	static int [] IndexTable = new int [GrowSize];

-	static Widget [] WidgetTable = new Widget [GrowSize];

-	static final int SWT_OBJECT_INDEX;

-	static {

-		byte [] buffer = Converter.wcsToMbcs (null, "SWT_OBJECT_INDEX", true);

-		SWT_OBJECT_INDEX = OS.g_quark_from_string (buffer);

-		for (int i=0; i<GrowSize-1; i++) IndexTable [i] = i + 1;

-		IndexTable [GrowSize - 1] = -1;

-	}

-	

-public static synchronized Widget get (int handle) {

-	if (handle == 0) return null;

-	int index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;

-	if (0 <= index && index < WidgetTable.length) return WidgetTable [index];

-	return null;

-}

-

-public synchronized static void put(int handle, Widget widget) {

-	if (handle == 0) return;

-	if (FreeSlot == -1) {

-		int length = (FreeSlot = IndexTable.length) + GrowSize;

-		int[] newIndexTable = new int[length];

-		Widget[] newWidgetTable = new Widget [length];

-		System.arraycopy (IndexTable, 0, newIndexTable, 0, FreeSlot);

-		System.arraycopy (WidgetTable, 0, newWidgetTable, 0, FreeSlot);

-		for (int i = FreeSlot; i < length - 1; i++) {

-			newIndexTable[i] = i + 1;

-		}

-		newIndexTable[length - 1] = -1;

-		IndexTable = newIndexTable;

-		WidgetTable = newWidgetTable;

-	}

-	int index = FreeSlot + 1;

-	OS.g_object_set_qdata (handle, SWT_OBJECT_INDEX, index);

-	int oldSlot = FreeSlot;

-	FreeSlot = IndexTable[oldSlot];

-	IndexTable [oldSlot] = -2;

-	WidgetTable [oldSlot] = widget;

-}

-

-public static synchronized Widget remove (int handle) {

-	if (handle == 0) return null;

-	Widget widget = null;

-	int index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;

-	if (0 <= index && index < WidgetTable.length) {

-		widget = WidgetTable [index];

-		WidgetTable [index] = null;

-		IndexTable [index] = FreeSlot;

-		FreeSlot = index;

-		OS.g_object_set_qdata (handle, SWT_OBJECT_INDEX, 0);

-	}

-	return widget;

-}

-

-public static synchronized Shell [] shells () {

-	int length = 0;

-	for (int i=0; i<WidgetTable.length; i++) {

-		Widget widget = WidgetTable [i];

-		if (widget != null && widget instanceof Shell) length++;

-	}

-	int index = 0;

-	Shell [] result = new Shell [length];

-	for (int i=0; i<WidgetTable.length; i++) {

-		Widget widget = WidgetTable [i];

-		if (widget != null && widget instanceof Shell) {

-			int j = 0;

-			while (j < index) {

-				if (result [j] == widget) break;

-				j++;

-			}

-			if (j == index)	result [index++] = (Shell) widget;

-		}

-	}

-	if (index == length) return result;

-	Shell [] newResult = new Shell [index];

-	System.arraycopy (result, 0, newResult, 0, index);

-	return newResult;

-}

-

-public static synchronized int size () {

-	int size = 0;

-	for (int i=0; i<WidgetTable.length; i++) {

-		if (WidgetTable [i] != null) size++;

-	}

-	return size;

-}

-

-}

+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+ 
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.gtk.*;
+
+class WidgetTable {
+	static int FreeSlot = 0;
+	static int GrowSize = 1024;
+	static int [] IndexTable = new int [GrowSize];
+	static Widget [] WidgetTable = new Widget [GrowSize];
+	static final int SWT_OBJECT_INDEX;
+	static {
+		byte [] buffer = Converter.wcsToMbcs (null, "SWT_OBJECT_INDEX", true);
+		SWT_OBJECT_INDEX = OS.g_quark_from_string (buffer);
+		for (int i=0; i<GrowSize-1; i++) IndexTable [i] = i + 1;
+		IndexTable [GrowSize - 1] = -1;
+	}
+	
+public static synchronized Widget get (int handle) {
+	if (handle == 0) return null;
+	int index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;
+	if (0 <= index && index < WidgetTable.length) return WidgetTable [index];
+	return null;
+}
+
+public synchronized static void put(int handle, Widget widget) {
+	if (handle == 0) return;
+	if (FreeSlot == -1) {
+		int length = (FreeSlot = IndexTable.length) + GrowSize;
+		int[] newIndexTable = new int[length];
+		Widget[] newWidgetTable = new Widget [length];
+		System.arraycopy (IndexTable, 0, newIndexTable, 0, FreeSlot);
+		System.arraycopy (WidgetTable, 0, newWidgetTable, 0, FreeSlot);
+		for (int i = FreeSlot; i < length - 1; i++) {
+			newIndexTable[i] = i + 1;
+		}
+		newIndexTable[length - 1] = -1;
+		IndexTable = newIndexTable;
+		WidgetTable = newWidgetTable;
+	}
+	int index = FreeSlot + 1;
+	OS.g_object_set_qdata (handle, SWT_OBJECT_INDEX, index);
+	int oldSlot = FreeSlot;
+	FreeSlot = IndexTable[oldSlot];
+	IndexTable [oldSlot] = -2;
+	WidgetTable [oldSlot] = widget;
+}
+
+public static synchronized Widget remove (int handle) {
+	if (handle == 0) return null;
+	Widget widget = null;
+	int index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;
+	if (0 <= index && index < WidgetTable.length) {
+		widget = WidgetTable [index];
+		WidgetTable [index] = null;
+		IndexTable [index] = FreeSlot;
+		FreeSlot = index;
+		OS.g_object_set_qdata (handle, SWT_OBJECT_INDEX, 0);
+	}
+	return widget;
+}
+
+public static synchronized Shell [] shells () {
+	int length = 0;
+	for (int i=0; i<WidgetTable.length; i++) {
+		Widget widget = WidgetTable [i];
+		if (widget != null && widget instanceof Shell) length++;
+	}
+	int index = 0;
+	Shell [] result = new Shell [length];
+	for (int i=0; i<WidgetTable.length; i++) {
+		Widget widget = WidgetTable [i];
+		if (widget != null && widget instanceof Shell) {
+			int j = 0;
+			while (j < index) {
+				if (result [j] == widget) break;
+				j++;
+			}
+			if (j == index)	result [index++] = (Shell) widget;
+		}
+	}
+	if (index == length) return result;
+	Shell [] newResult = new Shell [index];
+	System.arraycopy (result, 0, newResult, 0, index);
+	return newResult;
+}
+
+public static synchronized int size () {
+	int size = 0;
+	for (int i=0; i<WidgetTable.length; i++) {
+		if (WidgetTable [i] != null) size++;
+	}
+	return size;
+}
+
+}