changeset 71:295b29fc7d13

Renamed SWT to DWT
author Frank Benoit <benoit@tionex.de>
date Tue, 15 Jan 2008 06:44:34 +0100
parents 3a7f56c31c6c
children 5899e0b43e5d
files dwt/DWT.d dwt/DWTError.d dwt/DWTException.d dwt/SWT.d dwt/SWTError.d dwt/SWTException.d dwt/accessibility/Accessible.d dwt/accessibility/AccessibleControlEvent.d dwt/accessibility/AccessibleControlListener.d dwt/accessibility/AccessibleEvent.d dwt/accessibility/AccessibleFactory.d dwt/accessibility/AccessibleListener.d dwt/accessibility/AccessibleTextEvent.d dwt/accessibility/AccessibleTextListener.d dwt/events/ArmListener.d dwt/events/ControlListener.d dwt/events/DisposeListener.d dwt/events/DragDetectListener.d dwt/events/ExpandListener.d dwt/events/FocusListener.d dwt/events/HelpListener.d dwt/events/KeyEvent.d dwt/events/KeyListener.d dwt/events/MenuDetectListener.d dwt/events/MenuListener.d dwt/events/ModifyListener.d dwt/events/MouseEvent.d dwt/events/MouseListener.d dwt/events/MouseMoveListener.d dwt/events/MouseTrackListener.d dwt/events/MouseWheelListener.d dwt/events/PaintListener.d dwt/events/SelectionEvent.d dwt/events/SelectionListener.d dwt/events/ShellListener.d dwt/events/TraverseEvent.d dwt/events/TraverseListener.d dwt/events/TreeListener.d dwt/events/TypedEvent.d dwt/events/VerifyListener.d dwt/graphics/Color.d dwt/graphics/Cursor.d dwt/graphics/Device.d dwt/graphics/DeviceData.d dwt/graphics/Drawable.d dwt/graphics/Font.d dwt/graphics/FontData.d dwt/graphics/GC.d dwt/graphics/GCData.d dwt/graphics/GlyphMetrics.d dwt/graphics/Image.d dwt/graphics/ImageData.d dwt/graphics/ImageLoader.d dwt/graphics/ImageLoaderEvent.d dwt/graphics/ImageLoaderListener.d dwt/graphics/LineAttributes.d dwt/graphics/PaletteData.d dwt/graphics/Path.d dwt/graphics/Pattern.d dwt/graphics/RGB.d dwt/graphics/Rectangle.d dwt/graphics/Region.d dwt/graphics/Resource.d dwt/graphics/TextLayout.d dwt/graphics/TextStyle.d dwt/graphics/Transform.d dwt/internal/Compatibility.d dwt/internal/DWTEventListener.d dwt/internal/DWTEventObject.d dwt/internal/DWTMessages.properties dwt/internal/Library.d dwt/internal/SWTEventListener.d dwt/internal/SWTEventObject.d dwt/internal/SWTMessages.properties dwt/internal/cairo/Cairo.d dwt/internal/gtk/OS.d dwt/internal/image/FileFormat.d dwt/internal/image/GIFFileFormat.d dwt/internal/image/JPEGDecoder.d dwt/internal/image/JPEGFileFormat.d dwt/internal/image/JPEGFixedSizeSegment.d dwt/internal/image/JPEGFrameHeader.d dwt/internal/image/JPEGScanHeader.d dwt/internal/image/JPEGVariableSizeSegment.d dwt/internal/image/LZWCodec.d dwt/internal/image/OS2BMPFileFormat.d dwt/internal/image/PNGFileFormat.d dwt/internal/image/PngChunk.d dwt/internal/image/PngChunkReader.d dwt/internal/image/PngDecodingDataStream.d dwt/internal/image/PngEncoder.d dwt/internal/image/PngIdatChunk.d dwt/internal/image/PngIendChunk.d dwt/internal/image/PngIhdrChunk.d dwt/internal/image/PngPlteChunk.d dwt/internal/image/PngTrnsChunk.d dwt/internal/image/TIFFDirectory.d dwt/internal/image/TIFFFileFormat.d dwt/internal/image/TIFFModifiedHuffmanCodec.d dwt/internal/image/WinBMPFileFormat.d dwt/internal/image/WinICOFileFormat.d dwt/layout/FillData.d dwt/layout/FillLayout.d dwt/layout/FormAttachment.d dwt/layout/FormData.d dwt/layout/FormLayout.d dwt/layout/GridData.d dwt/layout/GridLayout.d dwt/layout/RowData.d dwt/layout/RowLayout.d dwt/widgets/Button.d dwt/widgets/Canvas.d dwt/widgets/Caret.d dwt/widgets/Combo.d dwt/widgets/Composite.d dwt/widgets/Control.d dwt/widgets/Decorations.d dwt/widgets/Display.d dwt/widgets/Event.d dwt/widgets/EventTable.d dwt/widgets/Group.d dwt/widgets/Item.d dwt/widgets/Label.d dwt/widgets/Layout.d dwt/widgets/List.d dwt/widgets/Listener.d dwt/widgets/Menu.d dwt/widgets/MenuItem.d dwt/widgets/Scale.d dwt/widgets/ScrollBar.d dwt/widgets/Scrollable.d dwt/widgets/Shell.d dwt/widgets/Slider.d dwt/widgets/Spinner.d dwt/widgets/Synchronizer.d dwt/widgets/Text.d dwt/widgets/ToolTip.d dwt/widgets/Tray.d dwt/widgets/TrayItem.d dwt/widgets/TypedListener.d dwt/widgets/Widget.d
diffstat 141 files changed, 7943 insertions(+), 7943 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/DWT.d	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,3642 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.DWT;
+
+
+import dwt.internal.Compatibility;
+import dwt.internal.Library;
+import dwt.internal.Platform;
+import dwt.DWTError;
+import dwt.DWTException;
+
+public import dwt.dwthelper.utils;
+
+import tango.core.Exception;
+
+/**
+ * This class provides access to a small number of DWT system-wide
+ * methods, and in addition defines the public constants provided
+ * by DWT.
+ * <p>
+ * By defining constants like UP and DOWN in a single class, DWT
+ * can share common names and concepts at the same time minimizing
+ * the number of classes, names and constants for the application
+ * programmer.
+ * </p><p>
+ * Note that some of the constants provided by this class represent
+ * optional, appearance related aspects of widgets which are available
+ * either only on some window systems, or for a differing set of
+ * widgets on each window system. These constants are marked
+ * as <em>HINT</em>s. The set of widgets which support a particular
+ * <em>HINT</em> may change from release to release, although we typically
+ * will not withdraw support for a <em>HINT</em> once it is made available.
+ * </p>
+ */
+
+/* NOTE:
+ *   Good javadoc coding style is to put the values of static const
+ *   constants in the comments. This reinforces the fact that
+ *   consumers are allowed to rely on the value (and they must
+ *   since the values are compiled inline in their code). We
+ *   can <em>not</em> change the values of these constants between
+ *   releases.
+ */
+public class DWT {
+
+    /* Widget Event Constants */
+
+    /**
+     * The null event type (value is 0).
+     *
+     * @since 3.0
+     */
+    public static const int None = 0;
+
+    /**
+     * The key down event type (value is 1).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addKeyListener
+     * @see dwt.widgets.Tracker#addKeyListener
+     * @see dwt.events.KeyListener#keyPressed
+     * @see dwt.events.KeyEvent
+     */
+    public static const int KeyDown = 1;
+
+    /**
+     * The key up event type (value is 2).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addKeyListener
+     * @see dwt.widgets.Tracker#addKeyListener
+     * @see dwt.events.KeyListener#keyReleased
+     * @see dwt.events.KeyEvent
+     */
+    public static const int KeyUp = 2;
+
+    /**
+     * The mouse down event type (value is 3).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseListener
+     * @see dwt.events.MouseListener#mouseDown
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseDown = 3;
+
+    /**
+     * The mouse up event type (value is 4).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseListener
+     * @see dwt.events.MouseListener#mouseUp
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseUp = 4;
+
+    /**
+     * The mouse move event type (value is 5).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseMoveListener
+     * @see dwt.events.MouseMoveListener#mouseMove
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseMove = 5;
+
+    /**
+     * The mouse enter event type (value is 6).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseTrackListener
+     * @see dwt.events.MouseTrackListener#mouseEnter
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseEnter = 6;
+
+    /**
+     * The mouse exit event type (value is 7).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseTrackListener
+     * @see dwt.events.MouseTrackListener#mouseExit
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseExit = 7;
+
+    /**
+     * The mouse double click event type (value is 8).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseListener
+     * @see dwt.events.MouseListener#mouseDoubleClick
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseDoubleClick = 8;
+
+    /**
+     * The paint event type (value is 9).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addPaintListener
+     * @see dwt.events.PaintListener#paintControl
+     * @see dwt.events.PaintEvent
+     */
+    public static const int Paint = 9;
+
+    /**
+     * The move event type (value is 10).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addControlListener
+     * @see dwt.widgets.TableColumn#addControlListener
+     * @see dwt.widgets.Tracker#addControlListener
+     * @see dwt.widgets.TreeColumn#addControlListener
+     * @see dwt.events.ControlListener#controlMoved
+     * @see dwt.events.ControlEvent
+     */
+    public static const int Move = 10;
+
+    /**
+     * The resize event type (value is 11).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addControlListener
+     * @see dwt.widgets.TableColumn#addControlListener
+     * @see dwt.widgets.Tracker#addControlListener
+     * @see dwt.widgets.TreeColumn#addControlListener
+     * @see dwt.events.ControlListener#controlResized
+     * @see dwt.events.ControlEvent
+     */
+    public static const int Resize = 11;
+
+    /**
+     * The dispose event type (value is 12).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Widget#addDisposeListener
+     * @see dwt.events.DisposeListener#widgetDisposed
+     * @see dwt.events.DisposeEvent
+     */
+    public static const int Dispose = 12;
+
+    /**
+     * The selection event type (value is 13).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Button#addSelectionListener
+     * @see dwt.widgets.Combo#addSelectionListener
+     * @see dwt.widgets.CoolItem#addSelectionListener
+     * @see dwt.widgets.Link#addSelectionListener
+     * @see dwt.widgets.List#addSelectionListener
+     * @see dwt.widgets.MenuItem#addSelectionListener
+     * @see dwt.widgets.Sash#addSelectionListener
+     * @see dwt.widgets.Scale#addSelectionListener
+     * @see dwt.widgets.ScrollBar#addSelectionListener
+     * @see dwt.widgets.Slider#addSelectionListener
+     * @see dwt.widgets.TabFolder#addSelectionListener
+     * @see dwt.widgets.Table#addSelectionListener
+     * @see dwt.widgets.TableColumn#addSelectionListener
+     * @see dwt.widgets.ToolItem#addSelectionListener
+     * @see dwt.widgets.TrayItem#addSelectionListener
+     * @see dwt.widgets.Tree#addSelectionListener
+     * @see dwt.widgets.TreeColumn#addSelectionListener
+     * @see dwt.events.SelectionListener#widgetSelected
+     * @see dwt.events.SelectionEvent
+     */
+    public static const int Selection = 13;
+
+    /**
+     * The default selection event type (value is 14).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Combo#addSelectionListener
+     * @see dwt.widgets.List#addSelectionListener
+     * @see dwt.widgets.Spinner#addSelectionListener
+     * @see dwt.widgets.Table#addSelectionListener
+     * @see dwt.widgets.Text#addSelectionListener
+     * @see dwt.widgets.TrayItem#addSelectionListener
+     * @see dwt.widgets.Tree#addSelectionListener
+     * @see dwt.events.SelectionListener#widgetDefaultSelected
+     * @see dwt.events.SelectionEvent
+     */
+    public static const int DefaultSelection = 14;
+
+    /**
+     * The focus in event type (value is 15).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addFocusListener
+     * @see dwt.events.FocusListener#focusGained
+     * @see dwt.events.FocusEvent
+     */
+    public static const int FocusIn = 15;
+
+    /**
+     * The focus out event type (value is 16).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addFocusListener
+     * @see dwt.events.FocusListener#focusLost
+     * @see dwt.events.FocusEvent
+     */
+    public static const int FocusOut = 16;
+
+    /**
+     * The expand event type (value is 17).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Tree#addTreeListener
+     * @see dwt.events.TreeListener#treeExpanded
+     * @see dwt.events.TreeEvent
+     */
+    public static const int Expand = 17;
+
+    /**
+     * The collapse event type (value is 18).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Tree#addTreeListener
+     * @see dwt.events.TreeListener#treeCollapsed
+     * @see dwt.events.TreeEvent
+     */
+    public static const int Collapse = 18;
+
+    /**
+     * The iconify event type (value is 19).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Shell#addShellListener
+     * @see dwt.events.ShellListener#shellIconified
+     * @see dwt.events.ShellEvent
+     */
+    public static const int Iconify = 19;
+
+    /**
+     * The de-iconify event type (value is 20).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Shell#addShellListener
+     * @see dwt.events.ShellListener#shellDeiconified
+     * @see dwt.events.ShellEvent
+     */
+    public static const int Deiconify = 20;
+
+    /**
+     * The close event type (value is 21).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Shell#addShellListener
+     * @see dwt.events.ShellListener#shellClosed
+     * @see dwt.events.ShellEvent
+     */
+    public static const int Close = 21;
+
+    /**
+     * The show event type (value is 22).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Menu#addMenuListener
+     * @see dwt.events.MenuListener#menuShown
+     * @see dwt.events.MenuEvent
+     */
+    public static const int Show = 22;
+
+    /**
+     * The hide event type (value is 23).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Menu#addMenuListener
+     * @see dwt.events.MenuListener#menuHidden
+     * @see dwt.events.MenuEvent
+     */
+    public static const int Hide = 23;
+
+    /**
+     * The modify event type (value is 24).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Combo#addModifyListener
+     * @see dwt.widgets.Spinner#addModifyListener
+     * @see dwt.widgets.Text#addModifyListener
+     * @see dwt.events.ModifyListener#modifyText
+     * @see dwt.events.ModifyEvent
+     */
+    public static const int Modify = 24;
+
+    /**
+     * The verify event type (value is 25).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Combo#addVerifyListener
+     * @see dwt.widgets.Text#addVerifyListener
+     * @see dwt.events.VerifyListener#verifyText
+     * @see dwt.events.VerifyEvent
+     */
+    public static const int Verify = 25;
+
+    /**
+     * The activate event type (value is 26).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Shell#addShellListener
+     * @see dwt.events.ShellListener#shellActivated
+     * @see dwt.events.ShellEvent
+     */
+    public static const int Activate = 26;
+
+    /**
+     * The deactivate event type (value is 27).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Shell#addShellListener
+     * @see dwt.events.ShellListener#shellDeactivated
+     * @see dwt.events.ShellEvent
+     */
+    public static const int Deactivate = 27;
+
+    /**
+     * The help event type (value is 28).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addHelpListener
+     * @see dwt.widgets.Menu#addHelpListener
+     * @see dwt.widgets.MenuItem#addHelpListener
+     * @see dwt.events.HelpListener#helpRequested
+     * @see dwt.events.HelpEvent
+     */
+    public static const int Help = 28;
+
+    /**
+     * The drag detect event type (value is 29).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.dnd.DragSource
+     */
+    public static const int DragDetect = 29;
+
+    /**
+     * The arm event type (value is 30).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.MenuItem#addArmListener
+     * @see dwt.events.ArmListener#widgetArmed
+     * @see dwt.events.ArmEvent
+     */
+    public static const int Arm = 30;
+
+    /**
+     * The traverse event type (value is 31).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addTraverseListener
+     * @see dwt.events.TraverseListener#keyTraversed
+     * @see dwt.events.TraverseEvent
+     */
+    public static const int Traverse = 31;
+
+    /**
+     * The mouse hover event type (value is 32).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Control#addMouseTrackListener
+     * @see dwt.events.MouseTrackListener#mouseHover
+     * @see dwt.events.MouseEvent
+     */
+    public static const int MouseHover = 32;
+
+    /**
+     * The hardware key down event type (value is 33).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     */
+    public static const int HardKeyDown = 33;
+
+    /**
+     * The hardware key up event type (value is 34).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     */
+    public static const int HardKeyUp = 34;
+
+    /**
+     * The menu detect event type (value is 35).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @since 3.0
+     */
+    public static const int MenuDetect = 35;
+
+    /**
+     * The set data event type (value is 36).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @see dwt.widgets.Table
+     * @see dwt.widgets.Tree
+     *
+     * @since 3.0
+     */
+    public static const int SetData = 36;
+
+    /**
+     * The mouse wheel event type (value is 37).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @since 3.1
+     */
+    public static const int MouseWheel = 37;
+
+    /**
+     * The settings changed event type (value is 39).
+     * <p>
+     * The settings changed event is sent when an operating system
+     * property, such as a system font or color, has been changed.
+     * The event occurs after the property has been changed, but
+     * before any widget is redrawn.  Applications that cache operating
+     * system properties can use this event to update their caches.
+     * A specific property change can be detected by querying the
+     * new value of a property and comparing it with the equivalent
+     * cached value.  The operating system automatically redraws and
+     * lays out all widgets after this event is sent.
+     * </p>
+     *
+     * @see dwt.widgets.Display#addListener
+     * @see dwt.widgets.Event
+     *
+     * @since 3.2
+     */
+    public static const int Settings = 39;
+
+    /**
+     * The erase item event type (value is 40).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @since 3.2
+     */
+    public static const int EraseItem = 40;
+
+    /**
+     * The measure item event type (value is 41).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @since 3.2
+     */
+    public static const int MeasureItem = 41;
+
+    /**
+     * The paint item event type (value is 42).
+     *
+     * @see dwt.widgets.Widget#addListener
+     * @see dwt.widgets.Display#addFilter
+     * @see dwt.widgets.Event
+     *
+     * @since 3.2
+     */
+    public static const int PaintItem = 42;
+
+    /* Event Details */
+
+    /**
+     * Indicates that a user-interface component is being dragged,
+     * for example dragging the thumb of a scroll bar (value is 1).
+     */
+    public static const int DRAG = 1;
+
+    /**
+     * Event detail field that indicates a user-interface component
+     * state is selected (value is 1&lt;&lt;1).
+     *
+     * @since 3.2
+     */
+    public static const int SELECTED = 1 << 1;
+
+    /**
+     * Event detail field that indicates a user-interface component
+     * state is focused (value is 1&lt;&lt;2).
+     *
+     * @since 3.2
+     */
+    public static const int FOCUSED = 1 << 2;
+
+    /**
+     * Event detail field that indicates a user-interface component
+     * draws the background (value is 1&lt;&lt;3).
+     *
+     * @since 3.2
+     */
+    public static const int BACKGROUND = 1 << 3;
+
+    /**
+     * Event detail field that indicates a user-interface component
+     * draws the foreground (value is 1&lt;&lt;4).
+     *
+     * @since 3.2
+     */
+    public static const int FOREGROUND = 1 << 4;
+
+    /**
+     * Event detail field that indicates a user-interface component
+     * state is hot (value is 1&lt;&lt;5).
+     *
+     * @since 3.3
+     */
+    public static const int HOT = 1 << 5;
+
+    /* This code is intentionally commented */
+    //public static const int PRESSED = 1 << 3;
+    //public static const int ACTIVE = 1 << 4;
+    //public static const int DISABLED = 1 << 5;
+    //public static const int HOT = 1 << 6;
+    //public static const int DEFAULTED = 1 << 7;
+
+    /**
+     * Traversal event detail field value indicating that no
+     * traversal action should be taken
+     * (value is 0).
+     */
+    public static const int TRAVERSE_NONE = 0;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that a dialog should be cancelled was
+     * pressed; typically, this is the ESC key
+     * (value is 1&lt;&lt;1).
+     */
+    public static const int TRAVERSE_ESCAPE = 1 << 1;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which activates the default button in a dialog was
+     * pressed; typically, this is the ENTER key
+     * (value is 1&lt;&lt;2).
+     */
+    public static const int TRAVERSE_RETURN = 1 << 2;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that focus should be given to the
+     * previous tab group was pressed; typically, this is the
+     * SHIFT-TAB key sequence
+     * (value is 1&lt;&lt;3).
+     */
+    public static const int TRAVERSE_TAB_PREVIOUS = 1 << 3;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that focus should be given to the
+     * next tab group was pressed; typically, this is the
+     * TAB key
+     * (value is 1&lt;&lt;4).
+     */
+    public static const int TRAVERSE_TAB_NEXT = 1 << 4;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that focus should be given to the
+     * previous tab item was pressed; typically, this is either
+     * the LEFT-ARROW or UP-ARROW keys
+     * (value is 1&lt;&lt;5).
+     */
+    public static const int TRAVERSE_ARROW_PREVIOUS = 1 << 5;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that focus should be given to the
+     * previous tab item was pressed; typically, this is either
+     * the RIGHT-ARROW or DOWN-ARROW keys
+     * (value is 1&lt;&lt;6).
+     */
+    public static const int TRAVERSE_ARROW_NEXT = 1 << 6;
+
+    /**
+     * Traversal event detail field value indicating that a
+     * mnemonic key sequence was pressed
+     * (value is 1&lt;&lt;7).
+     */
+    public static const int TRAVERSE_MNEMONIC = 1 << 7;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that the previous page of a multi-page
+     * window should be shown was pressed; typically, this
+     * is the CTRL-PAGEUP key sequence
+     * (value is 1&lt;&lt;8).
+     */
+    public static const int TRAVERSE_PAGE_PREVIOUS = 1 << 8;
+
+    /**
+     * Traversal event detail field value indicating that the
+     * key which designates that the next page of a multi-page
+     * window should be shown was pressed; typically, this
+     * is the CTRL-PAGEDOWN key sequence
+     * (value is 1&lt;&lt;9).
+     */
+    public static const int TRAVERSE_PAGE_NEXT = 1 << 9;
+
+    /**
+     * A constant known to be zero (0), typically used in operations
+     * which take bit flags to indicate that "no bits are set".
+     */
+    public static const int NONE = 0;
+
+    /**
+     * A constant known to be zero (0), used in operations which
+     * take pointers to indicate a null argument.
+     */
+    public static const int NULL = 0;
+
+    /**
+     * Indicates that a default should be used (value is -1).
+     */
+    public static const int DEFAULT = -1;
+
+    /**
+     * Indicates that a property is off (value is 0).
+     *
+     * @since 3.1
+     */
+    public static const int OFF = 0;
+
+    /**
+     * Indicates that a property is on (value is 1).
+     *
+     * @since 3.1
+     */
+    public static const int ON = 1;
+
+    /**
+     * Indicates low quality (value is 1).
+     *
+     * @since 3.1
+     */
+    public static const int LOW = 1;
+
+    /**
+     * Indicates high quality (value is 2).
+     *
+     * @since 3.1
+     */
+    public static const int HIGH = 2;
+
+    /**
+     * Style constant for menu bar behavior (value is 1&lt;&lt;1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Menu</code></li>
+     * </ul></p>
+     */
+    public static const int BAR = 1 << 1;
+
+    /**
+     * Style constant for drop down menu/list behavior (value is 1&lt;&lt;2).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Menu</code></li>
+     * <li><code>ToolItem</code></li>
+     * <li><code>CoolItem</code></li>
+     * <li><code>Combo</code></li>
+     * </ul></p>
+     */
+    public static const int DROP_DOWN = 1 << 2;
+
+    /**
+     * Style constant for pop up menu behavior (value is 1&lt;&lt;3).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Menu</code></li>
+     * </ul></p>
+     */
+    public static const int POP_UP = 1 << 3;
+
+    /**
+     * Style constant for line separator behavior (value is 1&lt;&lt;1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>MenuItem</code></li>
+     * <li><code>ToolItem</code></li>
+     * </ul></p>
+     */
+    public static const int SEPARATOR = 1 << 1;
+
+    /**
+     * Style constant for toggle button behavior (value is 1&lt;&lt;1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * </ul></p>
+     */
+    public static const int TOGGLE = 1 << 1;
+
+    /**
+     * Style constant for arrow button behavior (value is 1&lt;&lt;2).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * </ul></p>
+     */
+    public static const int ARROW = 1 << 2;
+
+    /**
+     * Style constant for push button behavior (value is 1&lt;&lt;3).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>MenuItem</code></li>
+     * <li><code>ToolItem</code></li>
+     * </ul></p>
+     */
+    public static const int PUSH = 1 << 3;
+
+    /**
+     * Style constant for radio button behavior (value is 1&lt;&lt;4).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>MenuItem</code></li>
+     * <li><code>ToolItem</code></li>
+     * </ul></p>
+     */
+    public static const int RADIO = 1 << 4;
+
+    /**
+     * Style constant for check box behavior (value is 1&lt;&lt;5).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>MenuItem</code></li>
+     * <li><code>ToolItem</code></li>
+     * <li><code>Table</code></li>
+     * <li><code>Tree</code></li>
+     * </ul></p>
+     */
+    public static const int CHECK = 1 << 5;
+
+    /**
+     * Style constant for cascade behavior (value is 1&lt;&lt;6).
+     * <p><b>Used By:</b><ul>
+     * <li><code>MenuItem</code></li>
+     * </ul></p>
+     */
+    public static const int CASCADE = 1 << 6;
+
+    /**
+     * Style constant for multi-selection behavior in lists
+     * and multiple line support on text fields (value is 1&lt;&lt;1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Text</code></li>
+     * <li><code>List</code></li>
+     * <li><code>FileDialog</code></li>
+     * </ul></p>
+     */
+    public static const int MULTI = 1 << 1;
+
+    /**
+     * Style constant for single selection behavior in lists
+     * and single line support on text fields (value is 1&lt;&lt;2).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Text</code></li>
+     * <li><code>List</code></li>
+     * <li><code>Table</code></li>
+     * <li><code>Tree</code></li>
+     * </ul></p>
+     */
+    public static const int SINGLE = 1 << 2;
+
+    /**
+     * Style constant for read-only behavior (value is 1&lt;&lt;3).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Combo</code></li>
+     * <li><code>Text</code></li>
+     * </ul></p>
+     */
+    public static const int READ_ONLY = 1 << 3;
+
+    /**
+     * Style constant for automatic line wrap behavior (value is 1&lt;&lt;6).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>Text</code></li>
+     * <li><code>ToolBar</code></li>
+     * <li><code>Spinner</code></li>
+     * </ul></p>
+     */
+    public static const int WRAP = 1 << 6;
+
+    /**
+     * Style constant for search behavior (value is 1&lt;&lt;7).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Text</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int SEARCH = 1 << 7;
+
+    /**
+     * Style constant for simple (not drop down) behavior (value is 1&lt;&lt;6).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Combo</code></li>
+     * </ul></p>
+     */
+    public static const int SIMPLE = 1 << 6;
+
+    /**
+     * Style constant for password behavior (value is 1&lt;&lt;22).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Text</code></li>
+     * </ul></p>
+     *
+     * @since 3.0
+     */
+    public static const int PASSWORD = 1 << 22;
+
+    /**
+     * Style constant for shadow in behavior (value is 1&lt;&lt;2).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>Group</code></li>
+     * </ul></p>
+     */
+    public static const int SHADOW_IN = 1 << 2;
+
+    /**
+     * Style constant for shadow out behavior (value is 1&lt;&lt;3).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>Group</code></li>
+     * <li><code>ToolBar</code></li>
+     * </ul></p>
+     */
+    public static const int SHADOW_OUT = 1 << 3;
+
+    /**
+     * Style constant for shadow etched in behavior (value is 1&lt;&lt;4).
+     * <br>Note that this is a <em>HINT</em>. It is ignored on all platforms except Motif.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Group</code></li>
+     * </ul></p>
+     */
+    public static const int SHADOW_ETCHED_IN = 1 << 4;
+
+    /**
+     * Style constant for shadow etched out behavior (value is 1&lt;&lt;6).
+     * <br>Note that this is a <em>HINT</em>. It is ignored on all platforms except Motif.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Group</code></li>
+     * </ul></p>
+     */
+    public static const int SHADOW_ETCHED_OUT = 1 << 6;
+
+    /**
+     * Style constant for no shadow behavior (value is 1&lt;&lt;5).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>Group</code></li>
+     * </ul></p>
+     */
+    public static const int SHADOW_NONE = 1 << 5;
+
+    /**
+     * Style constant for progress bar behavior (value is 1&lt;&lt;1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>ProgressBar</code></li>
+     * </ul></p>
+     */
+    public static const int INDETERMINATE = 1 << 1;
+
+    /**
+     * Style constant for tool window behavior (value is 1&lt;&lt;2).
+     * <p>
+     * A tool window is a window intended to be used as a floating toolbar.
+     * It typically has a title bar that is shorter than a normal title bar,
+     * and the window title is typically drawn using a smaller font.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p><p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int TOOL = 1 << 2;
+
+    /**
+     * Style constant to ensure no trimmings are used (value is 1&lt;&lt;3).
+     * <br>Note that this overrides all other trim styles.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int NO_TRIM = 1 << 3;
+
+    /**
+     * Style constant for resize box trim (value is 1&lt;&lt;4).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * <li><code>Tracker</code></li>
+     * </ul></p>
+     */
+    public static const int RESIZE = 1 << 4;
+
+    /**
+     * Style constant for title area trim (value is 1&lt;&lt;5).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int TITLE = 1 << 5;
+
+    /**
+     * Style constant for close box trim (value is 1&lt;&lt;6,
+     * since we do not distinguish between CLOSE style and MENU style).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int CLOSE = 1 << 6;
+
+    /**
+     * Style constant for shell menu trim (value is 1&lt;&lt;6,
+     * since we do not distinguish between CLOSE style and MENU style).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int MENU = CLOSE;
+
+    /**
+     * Style constant for minimize box trim (value is 1&lt;&lt;7).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int MIN = 1 << 7;
+
+    /**
+     * Style constant for maximize box trim (value is 1&lt;&lt;10).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Decorations</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int MAX = 1 << 10;
+
+    /**
+     * Style constant for horizontal scrollbar behavior (value is 1&lt;&lt;8).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Scrollable</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int H_SCROLL = 1 << 8;
+
+    /**
+     * Style constant for vertical scrollbar behavior (value is 1&lt;&lt;9).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Scrollable</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int V_SCROLL = 1 << 9;
+
+    /**
+     * Style constant for bordered behavior (value is 1&lt;&lt;11).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int BORDER = 1 << 11;
+
+    /**
+     * Style constant indicating that the window manager should clip
+     * a widget's children with respect to its viewable area. (value is 1&lt;&lt;12).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int CLIP_CHILDREN = 1 << 12;
+
+    /**
+     * Style constant indicating that the window manager should clip
+     * a widget's siblings with respect to its viewable area. (value is 1&lt;&lt;13).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int CLIP_SIBLINGS = 1 << 13;
+
+    /**
+     * Style constant for always on top behavior (value is 1&lt;&lt;14).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Shell</code> and subclasses</li>
+     * </ul></p>
+     */
+    public static const int ON_TOP = 1 << 14;
+
+    /**
+     * Trim style convenience constant for the most common top level shell appearance
+     * (value is CLOSE|TITLE|MIN|MAX|RESIZE).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int SHELL_TRIM = CLOSE | TITLE | MIN | MAX | RESIZE;
+
+    /**
+     * Trim style convenience constant for the most common dialog shell appearance
+     * (value is CLOSE|TITLE|BORDER).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int DIALOG_TRIM = TITLE | CLOSE | BORDER;
+
+    /**
+     * Style constant for modeless behavior (value is 0).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Dialog</code></li>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int MODELESS = 0;
+
+    /**
+     * Style constant for primary modal behavior (value is 1&lt;&lt;15).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Dialog</code></li>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int PRIMARY_MODAL = 1 << 15;
+
+    /**
+     * Style constant for application modal behavior (value is 1&lt;&lt;16).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Dialog</code></li>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int APPLICATION_MODAL = 1 << 16;
+
+    /**
+     * Style constant for system modal behavior (value is 1&lt;&lt;17).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Dialog</code></li>
+     * <li><code>Shell</code></li>
+     * </ul></p>
+     */
+    public static const int SYSTEM_MODAL = 1 << 17;
+
+    /**
+     * Style constant for selection hiding behavior when the widget loses focus (value is 1&lt;&lt;15).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Table</code></li>
+     * </ul></p>
+     */
+    public static const int HIDE_SELECTION = 1 << 15;
+
+    /**
+     * Style constant for full row selection behavior and
+     * selection constant indicating that a full line should be
+     * drawn. (value is 1&lt;&lt;16).
+     * <br>Note that for some widgets this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Table</code></li>
+     * <li><code>Tree</code></li>
+     * <li><code>StyledText</code></li>
+     * <li><code>TextLayout</code></li>
+     * </ul></p>
+     */
+    public static const int FULL_SELECTION = 1 << 16;
+
+    /**
+     * Style constant for flat appearance. (value is 1&lt;&lt;23).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>ToolBar</code></li>
+     * </ul></p>
+     */
+    public static const int FLAT = 1 << 23;
+
+    /**
+     * Style constant for smooth appearance. (value is 1&lt;&lt;16).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>ProgressBar</code></li>
+     * <li><code>Sash</code></li>
+     * </ul></p>
+     */
+    public static const int SMOOTH = 1 << 16;
+
+    /**
+     * Style constant for no background behavior (value is 1&lt;&lt;18).
+     * <p>
+     * By default, before a widget paints, the client area is filled with the current background.
+     * When this style is specified, the background is not filled, and the application is responsible
+     * for filling every pixel of the client area.
+     * This style might be used as an alternative to "double-buffering" in order to reduce flicker.
+     * This style does not mean "transparent" - widgets that are obscured will not draw through.
+     * </p><p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     */
+    public static const int NO_BACKGROUND = 1 << 18;
+
+    /**
+     * Style constant for no focus from the mouse behavior (value is 1&lt;&lt;19).
+     * <br>Note that this is a <em>HINT</em>.
+     * <p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     */
+    public static const int NO_FOCUS = 1 << 19;
+
+    /**
+     * Style constant for no redraw on resize behavior (value is 1&lt;&lt;20).
+     * <p>
+     * This style stops the entire client area from being invalidated when the size
+     * of the Canvas changes. Specifically, when the size of the Canvas gets smaller,
+     * the DWT.Paint event is not sent. When it gets bigger, an DWT.Paint event is
+     * sent with a GC clipped to only the new areas to be painted. Without this
+     * style, the entire client area will be repainted.
+     * </p><p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     */
+    public static const int NO_REDRAW_RESIZE = 1 << 20;
+
+    /**
+     * Style constant for no paint event merging behavior (value is 1&lt;&lt;21).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     */
+    public static const int NO_MERGE_PAINTS = 1 << 21;
+
+    /**
+     * Style constant for preventing child radio group behavior (value is 1&lt;&lt;22).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     */
+    public static const int NO_RADIO_GROUP = 1 << 22;
+
+    /**
+     * Style constant for left to right orientation (value is 1&lt;&lt;25).
+     * <p>
+     * When orientation is not explicitly specified, orientation is
+     * inherited.  This means that children will be assigned the
+     * orientation of their parent.  To override this behavior and
+     * force an orientation for a child, explicitly set the orientation
+     * of the child when that child is created.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * <li><code>Menu</code></li>
+     * <li><code>GC</code></li>
+     * </ul></p>
+     *
+     * @since 2.1.2
+     */
+    public static const int LEFT_TO_RIGHT = 1 << 25;
+
+    /**
+     * Style constant for right to left orientation (value is 1&lt;&lt;26).
+     * <p>
+     * When orientation is not explicitly specified, orientation is
+     * inherited.  This means that children will be assigned the
+     * orientation of their parent.  To override this behavior and
+     * force an orientation for a child, explicitly set the orientation
+     * of the child when that child is created.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * <li><code>Menu</code></li>
+     * <li><code>GC</code></li>
+     * </ul></p>
+     *
+     * @since 2.1.2
+     */
+    public static const int RIGHT_TO_LEFT = 1 << 26;
+
+    /**
+     * Style constant to indicate coordinate mirroring (value is 1&lt;&lt;27).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * <li><code>Menu</code></li>
+     * </ul></p>
+     *
+     * @since 2.1.2
+     */
+    public static const int MIRRORED = 1 << 27;
+
+    /**
+     * Style constant to allow embedding (value is 1&lt;&lt;24).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Composite</code></li>
+     * </ul></p>
+     *
+     * @since 3.0
+     */
+    public static const int EMBEDDED = 1 << 24;
+
+    /**
+     * Style constant to allow virtual data (value is 1&lt;&lt;28).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Table</code></li>
+     * <li><code>Tree</code></li>
+     * </ul></p>
+     *
+     * @since 3.0
+     */
+    public static const int VIRTUAL = 1 << 28;
+
+    /**
+     * Style constant to indicate double buffering (value is 1&lt;&lt;29).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * </ul></p>
+     *
+     * @since 3.1
+     */
+    public static const int DOUBLE_BUFFERED = 1 << 29;
+
+    /**
+     * Style constant for align up behavior (value is 1&lt;&lt;7,
+     * since align UP and align TOP are considered the same).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code> with <code>ARROW</code> style</li>
+     * <li><code>Tracker</code></li>
+     * </ul></p>
+     */
+    public static const int UP = 1 << 7;
+
+    /**
+     * Style constant for align top behavior (value is 1&lt;&lt;7,
+     * since align UP and align TOP are considered the same).
+     * <p><b>Used By:</b><ul>
+     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
+     * </ul></p>
+     */
+    public static const int TOP = UP;
+
+    /**
+     * Style constant for align down behavior (value is 1&lt;&lt;10,
+     * since align DOWN and align BOTTOM are considered the same).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code> with <code>ARROW</code> style</li>
+     * <li><code>Tracker</code></li>
+     * </ul></p>
+     */
+    public static const int DOWN               = 1 << 10;
+
+    /**
+     * Style constant for align bottom behavior (value is 1&lt;&lt;10,
+     * since align DOWN and align BOTTOM are considered the same).
+     * <p><b>Used By:</b><ul>
+     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
+     * </ul></p>
+     */
+    public static const int BOTTOM             = DOWN;
+
+    /**
+     * Style constant for leading alignment (value is 1&lt;&lt;14).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>Label</code></li>
+     * <li><code>TableColumn</code></li>
+     * <li><code>Tracker</code></li>
+     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
+     * </ul></p>
+     *
+     * @since 2.1.2
+     */
+    public static const int LEAD               = 1 << 14;
+
+    /**
+     * Style constant for align left behavior (value is 1&lt;&lt;14).
+     * This is a synonym for LEAD (value is 1&lt;&lt;14).  Newer
+     * applications should use LEAD instead of LEFT to make code more
+     * understandable on right-to-left platforms.
+     */
+    public static const int LEFT               = LEAD;
+
+    /**
+     * Style constant for trailing alignment (value is 1&lt;&lt;17).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>Label</code></li>
+     * <li><code>TableColumn</code></li>
+     * <li><code>Tracker</code></li>
+     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
+     * </ul></p>
+     *
+     * @since 2.1.2
+     */
+    public static const int TRAIL              = 1 << 17;
+
+    /**
+     * Style constant for align right behavior (value is 1&lt;&lt;17).
+     * This is a synonym for TRAIL (value is 1&lt;&lt;17).  Newer
+     * applications should use TRAIL instead of RIGHT to make code more
+     * understandable on right-to-left platforms.
+     */
+    public static const int RIGHT              = TRAIL;
+
+    /**
+     * Style constant for align center behavior (value is 1&lt;&lt;24).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Button</code></li>
+     * <li><code>Label</code></li>
+     * <li><code>TableColumn</code></li>
+     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
+     * </ul></p>
+     */
+    public static const int CENTER = 1 << 24;
+
+    /**
+     * Style constant for horizontal alignment or orientation behavior (value is 1&lt;&lt;8).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>ProgressBar</code></li>
+     * <li><code>Sash</code></li>
+     * <li><code>Scale</code></li>
+     * <li><code>ScrollBar</code></li>
+     * <li><code>Slider</code></li>
+     * <li><code>ToolBar</code></li>
+     * <li><code>FillLayout</code> type</li>
+     * <li><code>RowLayout</code> type</li>
+     * </ul></p>
+     */
+    public static const int HORIZONTAL = 1 << 8;
+
+    /**
+     * Style constant for vertical alignment or orientation behavior (value is 1&lt;&lt;9).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Label</code></li>
+     * <li><code>ProgressBar</code></li>
+     * <li><code>Sash</code></li>
+     * <li><code>Scale</code></li>
+     * <li><code>ScrollBar</code></li>
+     * <li><code>Slider</code></li>
+     * <li><code>ToolBar</code></li>
+     * <li><code>CoolBar</code></li>
+     * <li><code>FillLayout</code> type</li>
+     * <li><code>RowLayout</code> type</li>
+     * </ul></p>
+     */
+    public static const int VERTICAL = 1 << 9;
+
+    /**
+     * Style constant for date display (value is 1&lt;&lt;5).
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int DATE = 1 << 5;
+
+    /**
+     * Style constant for time display (value is 1&lt;&lt;7).
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int TIME = 1 << 7;
+
+    /**
+     * Style constant for calendar display (value is 1&lt;&lt;10).
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int CALENDAR = 1 << 10;
+
+    /**
+     * Style constant for short date/time format (value is 1&lt;&lt;15).
+     * <p>
+     * A short date displays the month and year.
+     * A short time displays hours and minutes.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int SHORT = 1 << 15;
+
+    /**
+     * Style constant for medium date/time format (value is 1&lt;&lt;16).
+     * <p>
+     * A medium date displays the day, month and year.
+     * A medium time displays hours, minutes, and seconds.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int MEDIUM = 1 << 16;
+
+    /**
+     * Style constant for long date/time format (value is 1&lt;&lt;28).
+     * <p>
+     * A long date displays the day, month and year.
+     * A long time displays hours, minutes, and seconds.
+     * The day and month names may be displayed.
+     * <br>Note that this is a <em>HINT</em>.
+     * </p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>DateTime</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int LONG = 1 << 28;
+
+    /**
+     * Style constant specifying that a Browser should use a Mozilla GRE
+     * for rendering its content (value is 1&lt;&lt;15).
+     * <p>
+     * <p><b>Used By:</b><ul>
+     * <li><code>Browser</code></li>
+     * </ul></p>
+     *
+     * @since 3.3
+     */
+    public static const int MOZILLA = 1 << 15;
+
+    /**
+     * Style constant for balloon behavior (value is 1&lt;&lt;12).
+     * <p><b>Used By:</b><ul>
+     * <li><code>ToolTip</code></li>
+     * </ul></p>
+     *
+     * @since 3.2
+     */
+    public static const int BALLOON = 1 << 12;
+
+    /**
+     * Style constant for vertical alignment or orientation behavior (value is 1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>GridLayout</code> type</li>
+     * </ul></p>
+     */
+    public static const int BEGINNING = 1;
+
+    /**
+     * Style constant for vertical alignment or orientation behavior (value is 4).
+     * <p><b>Used By:</b><ul>
+     * <li><code>GridLayout</code> type</li>
+     * </ul></p>
+     */
+    public static const int FILL = 4;
+
+    /**
+     * Input Method Editor style constant for double byte
+     * input behavior (value is 1&lt;&lt;1).
+     */
+    public static const int DBCS = 1 << 1;
+
+    /**
+     * Input Method Editor style constant for alpha
+     * input behavior (value is 1&lt;&lt;2).
+     */
+    public static const int ALPHA = 1 << 2;
+
+    /**
+     * Input Method Editor style constant for native
+     * input behavior (value is 1&lt;&lt;3).
+     */
+    public static const int NATIVE = 1 << 3;
+
+    /**
+     * Input Method Editor style constant for phonetic
+     * input behavior (value is 1&lt;&lt;4).
+     */
+    public static const int PHONETIC = 1 << 4;
+
+    /**
+     * Input Method Editor style constant for romanicized
+     * input behavior (value is 1&lt;&lt;5).
+     */
+    public static const int ROMAN = 1 << 5;
+
+    /**
+     * ASCII character convenience constant for the backspace character
+     * (value is the <code>char</code> '\b').
+     */
+    public static const char BS = '\b';
+
+    /**
+     * ASCII character convenience constant for the carriage return character
+     * (value is the <code>char</code> '\r').
+     */
+    public static const char CR = '\r';
+
+    /**
+     * ASCII character convenience constant for the delete character
+     * (value is the <code>char</code> with value 127).
+     */
+    public static const char DEL = 0x7F;
+
+    /**
+     * ASCII character convenience constant for the escape character
+     * (value is the <code>char</code> with value 27).
+     */
+    public static const char ESC = 0x1B;
+
+    /**
+     * ASCII character convenience constant for the line feed character
+     * (value is the <code>char</code> '\n').
+     */
+    public static const char LF = '\n';
+
+    /**
+     * ASCII character convenience constant for the tab character
+     * (value is the <code>char</code> '\t').
+     *
+     * @since 2.1
+     */
+    public static const char TAB = '\t';
+
+    /**
+     * keyboard and/or mouse event mask indicating that the ALT key
+     * was pushed on the keyboard when the event was generated
+     * (value is 1&lt;&lt;16).
+     */
+    public static const int ALT = 1 << 16;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the SHIFT key
+     * was pushed on the keyboard when the event was generated
+     * (value is 1&lt;&lt;17).
+     */
+    public static const int SHIFT = 1 << 17;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the CTRL key
+     * was pushed on the keyboard when the event was generated
+     * (value is 1&lt;&lt;18).
+     */
+    public static const int CTRL = 1 << 18;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the CTRL key
+     * was pushed on the keyboard when the event was generated. This
+     * is a synonym for CTRL (value is 1&lt;&lt;18).
+     */
+    public static const int CONTROL = CTRL;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the COMMAND key
+     * was pushed on the keyboard when the event was generated
+     * (value is 1&lt;&lt;22).
+     *
+     * @since 2.1
+     */
+    public static const int COMMAND = 1 << 22;
+
+    /**
+     * Keyboard and/or mouse event mask indicating all possible
+     * keyboard modifiers.
+     *
+     * To allow for the future, this mask  is intended to be used in
+     * place of code that references  each individual keyboard mask.
+     *  For example, the following expression will determine whether
+     * any modifier is pressed and will continue to work as new modifier
+     * masks are added.
+     *
+     * <code>(stateMask & DWT.MODIFIER_MASK) != 0</code>.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int MODIFIER_MASK;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that mouse button one
+     * was pushed when the event was generated. (value is 1&lt;&lt;19).
+     */
+    public static const int BUTTON1 = 1 << 19;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that mouse button two
+     * was pushed when the event was generated. (value is 1&lt;&lt;20).
+     */
+    public static const int BUTTON2 = 1 << 20;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that mouse button three
+     * was pushed when the event was generated. (value is 1&lt;&lt;21).
+     */
+    public static const int BUTTON3 = 1 << 21;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that mouse button four
+     * was pushed when the event was generated. (value is 1&lt;&lt;23).
+     *
+     * @since 3.1
+     */
+    public static const int BUTTON4 = 1 << 23;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that mouse button five
+     * was pushed when the event was generated. (value is 1&lt;&lt;25).
+     *
+     * @since 3.1
+     */
+    public static const int BUTTON5 = 1 << 25;
+
+    /**
+     * Keyboard and/or mouse event mask indicating all possible
+     * mouse buttons.
+     *
+     * To allow for the future, this mask  is intended to be used
+     * in place of code that references each individual button mask.
+     * For example, the following expression will determine whether
+     * any button is pressed and will continue to work as new button
+     * masks are added.
+     *
+     * <code>(stateMask & DWT.BUTTON_MASK) != 0</code>.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int BUTTON_MASK;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the MOD1 key
+     * was pushed on the keyboard when the event was generated.
+     *
+     * This is the primary keyboard modifier for the platform.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int MOD1;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the MOD2 key
+     * was pushed on the keyboard when the event was generated.
+     *
+     * This is the secondary keyboard modifier for the platform.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int MOD2;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the MOD3 key
+     * was pushed on the keyboard when the event was generated.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int MOD3;
+
+    /**
+     * Keyboard and/or mouse event mask indicating that the MOD4 key
+     * was pushed on the keyboard when the event was generated.
+     *
+     * @since 2.1
+     */
+    public static /*const*/ int MOD4;
+
+    /**
+     * Constants to indicate line scrolling (value is 1).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * </ul></p>
+     *
+     * @since 3.1
+     */
+    public static const int SCROLL_LINE = 1;
+
+    /**
+     * Constants to indicate page scrolling (value is 2).
+     * <p><b>Used By:</b><ul>
+     * <li><code>Control</code></li>
+     * </ul></p>
+     *
+     * @since 3.1
+     */
+    public static const int SCROLL_PAGE = 2;
+
+    /**
+     * Accelerator constant used to differentiate a key code from a
+     * unicode character.
+     *
+     * If this bit is set, then the key stroke
+     * portion of an accelerator represents a key code.  If this bit
+     * is not set, then the key stroke portion of an accelerator is
+     * a unicode character.
+     *
+     * The following expression is false:
+     *
+     * <code>((DWT.MOD1 | DWT.MOD2 | 'T') & DWT.KEYCODE_BIT) != 0</code>.
+     *
+     * The following expression is true:
+     *
+     * <code>((DWT.MOD3 | DWT.F2) & DWT.KEYCODE_BIT) != 0</code>.
+     *
+     * (value is (1&lt;&lt;24))
+     *
+     * @since 2.1
+     */
+    public static const int KEYCODE_BIT = (1 << 24);
+
+    /**
+     * Accelerator constant used to extract the key stroke portion of
+     * an accelerator.
+     *
+     * The key stroke may be a key code or a unicode
+     * value.  If the key stroke is a key code <code>KEYCODE_BIT</code>
+     * will be set.
+     *
+     * @since 2.1
+     */
+    public static const int KEY_MASK = KEYCODE_BIT + 0xFFFF;
+
+    /**
+     * Keyboard event constant representing the UP ARROW key
+     * (value is (1&lt;&lt;24)+1).
+     */
+    public static const int ARROW_UP = KEYCODE_BIT + 1;
+
+    /**
+     * Keyboard event constant representing the DOWN ARROW key
+     * (value is (1&lt;&lt;24)+2).
+     */
+    public static const int ARROW_DOWN = KEYCODE_BIT + 2;
+
+    /**
+     * Keyboard event constant representing the LEFT ARROW key
+     * (value is (1&lt;&lt;24)+3).
+     */
+    public static const int ARROW_LEFT = KEYCODE_BIT + 3;
+
+    /**
+     * Keyboard event constant representing the RIGHT ARROW key
+     * (value is (1&lt;&lt;24)+4).
+     */
+    public static const int ARROW_RIGHT = KEYCODE_BIT + 4;
+
+    /**
+     * Keyboard event constant representing the PAGE UP key
+     * (value is (1&lt;&lt;24)+5).
+     */
+    public static const int PAGE_UP = KEYCODE_BIT + 5;
+
+    /**
+     * Keyboard event constant representing the PAGE DOWN key
+     * (value is (1&lt;&lt;24)+6).
+     */
+    public static const int PAGE_DOWN = KEYCODE_BIT + 6;
+
+    /**
+     * Keyboard event constant representing the HOME key
+     * (value is (1&lt;&lt;24)+7).
+     */
+    public static const int HOME = KEYCODE_BIT + 7;
+
+    /**
+     * Keyboard event constant representing the END key
+     * (value is (1&lt;&lt;24)+8).
+     */
+    public static const int END = KEYCODE_BIT + 8;
+
+    /**
+     * Keyboard event constant representing the INSERT key
+     * (value is (1&lt;&lt;24)+9).
+     */
+    public static const int INSERT = KEYCODE_BIT + 9;
+
+    /**
+     * Keyboard event constant representing the F1 key
+     * (value is (1&lt;&lt;24)+10).
+     */
+    public static const int F1 = KEYCODE_BIT + 10;
+
+    /**
+     * Keyboard event constant representing the F2 key
+     * (value is (1&lt;&lt;24)+11).
+     */
+    public static const int F2 = KEYCODE_BIT + 11;
+
+    /**
+     * Keyboard event constant representing the F3 key
+     * (value is (1&lt;&lt;24)+12).
+     */
+    public static const int F3 = KEYCODE_BIT + 12;
+
+    /**
+     * Keyboard event constant representing the F4 key
+     * (value is (1&lt;&lt;24)+13).
+     */
+    public static const int F4 = KEYCODE_BIT + 13;
+
+    /**
+     * Keyboard event constant representing the F5 key
+     * (value is (1&lt;&lt;24)+14).
+     */
+    public static const int F5 = KEYCODE_BIT + 14;
+
+    /**
+     * Keyboard event constant representing the F6 key
+     * (value is (1&lt;&lt;24)+15).
+     */
+    public static const int F6 = KEYCODE_BIT + 15;
+
+    /**
+     * Keyboard event constant representing the F7 key
+     * (value is (1&lt;&lt;24)+16).
+     */
+    public static const int F7 = KEYCODE_BIT + 16;
+
+    /**
+     * Keyboard event constant representing the F8 key
+     * (value is (1&lt;&lt;24)+17).
+     */
+    public static const int F8 = KEYCODE_BIT + 17;
+
+    /**
+     * Keyboard event constant representing the F9 key
+     * (value is (1&lt;&lt;24)+18).
+     */
+    public static const int F9 = KEYCODE_BIT + 18;
+
+    /**
+     * Keyboard event constant representing the F10 key
+     * (value is (1&lt;&lt;24)+19).
+     */
+    public static const int F10 = KEYCODE_BIT + 19;
+
+    /**
+     * Keyboard event constant representing the F11 key
+     * (value is (1&lt;&lt;24)+20).
+     */
+    public static const int F11 = KEYCODE_BIT + 20;
+
+    /**
+     * Keyboard event constant representing the F12 key
+     * (value is (1&lt;&lt;24)+21).
+     */
+    public static const int F12 = KEYCODE_BIT + 21;
+
+    /**
+     * Keyboard event constant representing the F13 key
+     * (value is (1&lt;&lt;24)+22).
+     *
+     * @since 3.0
+     */
+    public static const int F13 = KEYCODE_BIT + 22;
+
+    /**
+     * Keyboard event constant representing the F14 key
+     * (value is (1&lt;&lt;24)+23).
+     *
+     * @since 3.0
+     */
+    public static const int F14 = KEYCODE_BIT + 23;
+
+    /**
+     * Keyboard event constant representing the F15 key
+     * (value is (1&lt;&lt;24)+24).
+     *
+     * @since 3.0
+     */
+    public static const int F15 = KEYCODE_BIT + 24;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad multiply key (value is (1&lt;&lt;24)+42).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_MULTIPLY = KEYCODE_BIT + 42;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad add key (value is (1&lt;&lt;24)+43).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_ADD = KEYCODE_BIT + 43;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad subtract key (value is (1&lt;&lt;24)+45).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_SUBTRACT = KEYCODE_BIT + 45;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad decimal key (value is (1&lt;&lt;24)+46).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_DECIMAL = KEYCODE_BIT + 46;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad divide key (value is (1&lt;&lt;24)+47).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_DIVIDE = KEYCODE_BIT + 47;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad zero key (value is (1&lt;&lt;24)+48).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_0 = KEYCODE_BIT + 48;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad one key (value is (1&lt;&lt;24)+49).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_1 = KEYCODE_BIT + 49;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad two key (value is (1&lt;&lt;24)+50).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_2 = KEYCODE_BIT + 50;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad three key (value is (1&lt;&lt;24)+51).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_3 = KEYCODE_BIT + 51;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad four key (value is (1&lt;&lt;24)+52).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_4 = KEYCODE_BIT + 52;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad five key (value is (1&lt;&lt;24)+53).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_5 = KEYCODE_BIT + 53;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad six key (value is (1&lt;&lt;24)+54).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_6 = KEYCODE_BIT + 54;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad seven key (value is (1&lt;&lt;24)+55).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_7 = KEYCODE_BIT + 55;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad eight key (value is (1&lt;&lt;24)+56).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_8 = KEYCODE_BIT + 56;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad nine key (value is (1&lt;&lt;24)+57).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_9 = KEYCODE_BIT + 57;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad equal key (value is (1&lt;&lt;24)+61).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_EQUAL = KEYCODE_BIT + 61;
+
+    /**
+     * Keyboard event constant representing the numeric key
+     * pad enter key (value is (1&lt;&lt;24)+80).
+     *
+     * @since 3.0
+     */
+    public static const int KEYPAD_CR = KEYCODE_BIT + 80;
+
+    /**
+     * Keyboard event constant representing the help
+     * key (value is (1&lt;&lt;24)+81).
+     *
+     * NOTE: The HELP key maps to the key labeled "help",
+     * not "F1". If your keyboard does not have a HELP key,
+     * you will never see this key press.  To listen for
+     * help on a control, use DWT.Help.
+     *
+     * @since 3.0
+     *
+     * @see DWT#Help
+     */
+    public static const int HELP = KEYCODE_BIT + 81;
+
+    /**
+     * Keyboard event constant representing the caps
+     * lock key (value is (1&lt;&lt;24)+82).
+     *
+     * @since 3.0
+     */
+    public static const int CAPS_LOCK = KEYCODE_BIT + 82;
+
+    /**
+     * Keyboard event constant representing the num
+     * lock key (value is (1&lt;&lt;24)+83).
+     *
+     * @since 3.0
+     */
+    public static const int NUM_LOCK = KEYCODE_BIT + 83;
+
+    /**
+     * Keyboard event constant representing the scroll
+     * lock key (value is (1&lt;&lt;24)+84).
+     *
+     * @since 3.0
+     */
+    public static const int SCROLL_LOCK = KEYCODE_BIT + 84;
+
+    /**
+     * Keyboard event constant representing the pause
+     * key (value is (1&lt;&lt;24)+85).
+     *
+     * @since 3.0
+     */
+    public static const int PAUSE = KEYCODE_BIT + 85;
+
+    /**
+     * Keyboard event constant representing the break
+     * key (value is (1&lt;&lt;24)+86).
+     *
+     * @since 3.0
+     */
+    public static const int BREAK = KEYCODE_BIT + 86;
+
+    /**
+     * Keyboard event constant representing the print screen
+     * key (value is (1&lt;&lt;24)+87).
+     *
+     * @since 3.0
+     */
+    public static const int PRINT_SCREEN = KEYCODE_BIT + 87;
+
+    /**
+     * The <code>MessageBox</code> style constant for error icon
+     * behavior (value is 1).
+     */
+    public static const int ICON_ERROR = 1;
+
+    /**
+     * The <code>MessageBox</code> style constant for information icon
+     * behavior (value is 1&lt;&lt;1).
+     */
+    public static const int ICON_INFORMATION = 1 << 1;
+
+    /**
+     * The <code>MessageBox</code> style constant for question icon
+     * behavior (value is 1&lt;&lt;2).
+     */
+    public static const int ICON_QUESTION = 1 << 2;
+
+    /**
+     * The <code>MessageBox</code> style constant for warning icon
+     * behavior (value is 1&lt;&lt;3).
+     */
+    public static const int ICON_WARNING = 1 << 3;
+
+    /**
+     * The <code>MessageBox</code> style constant for "working" icon
+     * behavior (value is 1&lt;&lt;4).
+     */
+    public static const int ICON_WORKING = 1 << 4;
+
+    /**
+     * The <code>MessageBox</code> style constant for an OK button;
+     * valid combinations are OK, OK|CANCEL
+     * (value is 1&lt;&lt;5).
+     */
+    public static const int OK = 1 << 5;
+
+    /**
+     * The <code>MessageBox</code> style constant for YES button;
+     * valid combinations are YES|NO, YES|NO|CANCEL
+     * (value is 1&lt;&lt;6).
+     */
+    public static const int YES = 1 << 6;
+
+    /**
+     * The <code>MessageBox</code> style constant for NO button;
+     * valid combinations are YES|NO, YES|NO|CANCEL
+     * (value is 1&lt;&lt;7).
+     */
+    public static const int NO = 1 << 7;
+
+    /**
+     * The <code>MessageBox</code> style constant for a CANCEL button;
+     * valid combinations are OK|CANCEL, YES|NO|CANCEL, RETRY|CANCEL
+     * (value is 1&lt;&lt;8).  This style constant is also used with
+     * <code>Text</code> in combination with SEARCH.
+     *
+     * <p><b>Used By:</b><ul>
+     * <li><code>MessageBox</code></li>
+     * <li><code>Text</code></li>
+     * </ul></p>
+     */
+    public static const int CANCEL = 1 << 8;
+
+    /**
+     * The <code>MessageBox</code> style constant for an ABORT button;
+     * the only valid combination is ABORT|RETRY|IGNORE
+     * (value is 1&lt;&lt;9).
+     */
+    public static const int ABORT = 1 << 9;
+
+    /**
+     * The <code>MessageBox</code> style constant for a RETRY button;
+     *  valid combinations are ABORT|RETRY|IGNORE, RETRY|CANCEL
+     * (value is 1&lt;&lt;10).
+     */
+    public static const int RETRY = 1 << 10;
+
+    /**
+     * The <code>MessageBox</code> style constant for an IGNORE button;
+     * the only valid combination is ABORT|RETRY|IGNORE
+     * (value is 1&lt;&lt;11).
+     */
+    public static const int IGNORE = 1 << 11;
+
+    /**
+     * The <code>FileDialog</code> style constant for open file dialog behavior
+     * (value is 1&lt;&lt;12).
+     */
+    public static const int OPEN = 1 << 12;
+
+    /**
+     * The <code>FileDialog</code> style constant for save file dialog behavior
+     * (value is 1&lt;&lt;13).
+     */
+    public static const int SAVE = 1 << 13;
+
+    /**
+     * The <code>Composite</code> constant to indicate that
+     * an attribute (such as background) is not inherited
+     * by the children (value is 0).
+     *
+     * @since 3.2
+     */
+    public static const int INHERIT_NONE = 0;
+
+    /**
+     * The <code>Composite</code> constant to indicate that
+     * an attribute (such as background) is inherited by
+     * children who choose this value as their "default"
+     * (value is 1).  For example, a label child will
+     * typically choose to inherit the background color
+     * of a composite while a list or table will not.
+     *
+     * @since 3.2
+     */
+    public static const int INHERIT_DEFAULT = 1;
+
+    /**
+     * The <code>Composite</code> constant to indicate that
+     * an attribute (such as background) is inherited by
+     * all children.
+     *
+     * @since 3.2
+     */
+    public static const int INHERIT_FORCE = 2;
+
+    /**
+     * Default color white (value is 1).
+     */
+    public static const int COLOR_WHITE = 1;
+
+    /**
+     * Default color black (value is 2).
+     */
+    public static const int COLOR_BLACK = 2;
+
+    /**
+     * Default color red (value is 3).
+     */
+    public static const int COLOR_RED = 3;
+
+    /**
+     * Default color dark red (value is 4).
+     */
+    public static const int COLOR_DARK_RED = 4;
+
+    /**
+     * Default color green (value is 5).
+     */
+    public static const int COLOR_GREEN = 5;
+
+    /**
+     * Default color dark green (value is 6).
+     */
+    public static const int COLOR_DARK_GREEN = 6;
+
+    /**
+     * Default color yellow (value is 7).
+     */
+    public static const int COLOR_YELLOW = 7;
+
+    /**
+     * Default color dark yellow (value is 8).
+     */
+    public static const int COLOR_DARK_YELLOW = 8;
+
+    /**
+     * Default color blue (value is 9).
+     */
+    public static const int COLOR_BLUE = 9;
+
+    /**
+     * Default color dark blue (value is 10).
+     */
+    public static const int COLOR_DARK_BLUE = 10;
+
+    /**
+     * Default color magenta (value is 11).
+     */
+    public static const int COLOR_MAGENTA = 11;
+
+    /**
+     * Default color dark magenta (value is 12).
+     */
+    public static const int COLOR_DARK_MAGENTA = 12;
+
+    /**
+     * Default color cyan (value is 13).
+     */
+    public static const int COLOR_CYAN = 13;
+
+    /**
+     * Default color dark cyan (value is 14).
+     */
+    public static const int COLOR_DARK_CYAN = 14;
+
+    /**
+     * Default color gray (value is 15).
+     */
+    public static const int COLOR_GRAY = 15;
+
+    /**
+     * Default color dark gray (value is 16).
+     */
+    public static const int COLOR_DARK_GRAY = 16;
+
+    /*
+     * System Colors
+     *
+     * Dealing with system colors is an area where there are
+     * many platform differences.  On some platforms, system
+     * colors can change dynamically while the program is
+     * running.  On other platforms, system colors can be
+     * changed for all instances of a particular widget.
+     * Therefore, the only truly portable method to obtain
+     * a widget color query is to query the color from an
+     * instance of the widget.
+     *
+     *  It is expected that the list of supported colors
+     * will grow over time.
+     */
+
+    /**
+     * System color used to paint dark shadow areas (value is 17).
+     */
+    public static const int COLOR_WIDGET_DARK_SHADOW = 17;
+
+    /**
+     * System color used to paint normal shadow areas (value is 18).
+     */
+    public static const int COLOR_WIDGET_NORMAL_SHADOW = 18;
+
+    /**
+     * System color used to paint light shadow areas (value is 19).
+     */
+    public static const int COLOR_WIDGET_LIGHT_SHADOW = 19;
+
+    /**
+     * System color used to paint highlight shadow areas (value is 20).
+     */
+    public static const int COLOR_WIDGET_HIGHLIGHT_SHADOW = 20;
+
+    /**
+     * System color used to paint foreground areas (value is 21).
+     */
+    public static const int COLOR_WIDGET_FOREGROUND = 21;
+
+    /**
+     * System color used to paint background areas (value is 22).
+     */
+    public static const int COLOR_WIDGET_BACKGROUND = 22;
+
+    /**
+     * System color used to paint border areas (value is 23).
+     */
+    public static const int COLOR_WIDGET_BORDER = 23;
+
+    /**
+     * System color used to paint list foreground areas (value is 24).
+     */
+    public static const int COLOR_LIST_FOREGROUND = 24;
+
+    /**
+     * System color used to paint list background areas (value is 25).
+     */
+    public static const int COLOR_LIST_BACKGROUND = 25;
+
+    /**
+     * System color used to paint list selection background areas (value is 26).
+     */
+    public static const int COLOR_LIST_SELECTION = 26;
+
+    /**
+     * System color used to paint list selected text (value is 27).
+     */
+    public static const int COLOR_LIST_SELECTION_TEXT = 27;
+
+    /**
+     * System color used to paint tooltip text (value is 28).
+     */
+    public static const int COLOR_INFO_FOREGROUND = 28;
+
+    /**
+     * System color used to paint tooltip background areas (value is 29).
+     */
+    public static const int COLOR_INFO_BACKGROUND = 29;
+
+    /**
+     * System color used to paint title text (value is 30).
+     */
+    public static const int COLOR_TITLE_FOREGROUND = 30;
+
+    /**
+     * System color used to paint title background areas (value is 31).
+     */
+    public static const int COLOR_TITLE_BACKGROUND = 31;
+
+    /**
+     * System color used to paint title background gradient (value is 32).
+     */
+    public static const int COLOR_TITLE_BACKGROUND_GRADIENT = 32;
+
+    /**
+     * System color used to paint inactive title text (value is 33).
+     */
+    public static const int COLOR_TITLE_INACTIVE_FOREGROUND = 33;
+
+    /**
+     * System color used to paint inactive title background areas (value is 34).
+     */
+    public static const int COLOR_TITLE_INACTIVE_BACKGROUND = 34;
+
+    /**
+     * System color used to paint inactive title background gradient (value is 35).
+     */
+    public static const int COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = 35;
+
+    /**
+     * Draw constant indicating whether the drawing operation
+     * should fill the background (value is 1&lt;&lt;0).
+     */
+    public static const int DRAW_TRANSPARENT = 1 << 0;
+
+    /**
+     * Draw constant indicating whether the string drawing operation
+     * should handle line-delimiters (value is 1&lt;&lt;1).
+     */
+    public static const int DRAW_DELIMITER = 1 << 1;
+
+    /**
+     * Draw constant indicating whether the string drawing operation
+     * should expand TAB characters (value is 1&lt;&lt;2).
+     */
+    public static const int DRAW_TAB = 1 << 2;
+
+    /**
+     * Draw constant indicating whether the string drawing operation
+     * should handle mnemonics (value is 1&lt;&lt;3).
+     */
+    public static const int DRAW_MNEMONIC = 1 << 3;
+
+
+    /**
+     * Selection constant indicating that a line delimiter should be
+     * drawn (value is 1&lt;&lt;17).
+     *
+     * <p><b>Used By:</b><ul>
+     * <li><code>TextLayout</code></li>
+     * </ul></p>
+     *
+     * @see #FULL_SELECTION
+     * @see #LAST_LINE_SELECTION
+     *
+     * @since 3.3
+     */
+    public static const int DELIMITER_SELECTION = 1 << 17;
+
+    /**
+     * Selection constant indicating that the last line is selected
+     * to the end and should be drawn using either a line delimiter
+     * or full line selection (value is 1&lt;&lt;20).
+     *
+     * <p><b>Used By:</b><ul>
+     * <li><code>TextLayout</code></li>
+     * </ul></p>
+     *
+     * @see #DELIMITER_SELECTION
+     * @see #FULL_SELECTION
+     *
+     * @since 3.3
+     */
+    public static const int LAST_LINE_SELECTION = 1 << 20;
+
+    /**
+     * DWT error constant indicating that no error number was specified
+     * (value is 1).
+     */
+    public static const int ERROR_UNSPECIFIED = 1;
+
+    /**
+     * DWT error constant indicating that no more handles for an
+     * operating system resource are available
+     * (value is 2).
+     */
+    public static const int ERROR_NO_HANDLES = 2;
+
+    /**
+     * DWT error constant indicating that no more callback resources are available
+     * (value is 3).
+     */
+    public static const int ERROR_NO_MORE_CALLBACKS = 3;
+
+    /**
+     * DWT error constant indicating that a null argument was passed in
+     * (value is 4).
+     */
+    public static const int ERROR_NULL_ARGUMENT = 4;
+
+    /**
+     * DWT error constant indicating that an invalid argument was passed in
+     * (value is 5).
+     */
+    public static const int ERROR_INVALID_ARGUMENT = 5;
+
+    /**
+     * DWT error constant indicating that a value was found to be
+     * outside the allowable range
+     * (value is 6).
+     */
+    public static const int ERROR_INVALID_RANGE = 6;
+
+    /**
+     * DWT error constant indicating that a value which can not be
+     * zero was found to be
+     * (value is 7).
+     */
+    public static const int ERROR_CANNOT_BE_ZERO = 7;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide the value of an item
+     * (value is 8).
+     */
+    public static const int ERROR_CANNOT_GET_ITEM = 8;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide the selection
+     * (value is 9).
+     */
+    public static const int ERROR_CANNOT_GET_SELECTION = 9;
+
+    /**
+     * DWT error constant indicating that the matrix is not invertible
+     * (value is 10).
+     *
+     * @since 3.1
+     */
+    public static const int ERROR_CANNOT_INVERT_MATRIX = 10;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide the height of an item
+     * (value is 11).
+     */
+    public static const int ERROR_CANNOT_GET_ITEM_HEIGHT = 11;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide the text of a widget
+     * (value is 12).
+     */
+    public static const int ERROR_CANNOT_GET_TEXT = 12;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to set the text of a widget
+     * (value is 13).
+     */
+    public static const int ERROR_CANNOT_SET_TEXT = 13;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to add an item
+     * (value is 14).
+     */
+    public static const int ERROR_ITEM_NOT_ADDED = 14;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to remove an item
+     * (value is 15).
+     */
+    public static const int ERROR_ITEM_NOT_REMOVED = 15;
+
+    /**
+     * DWT error constant indicating that the graphics library
+     * is not available
+     * (value is 16).
+     */
+    public static const int ERROR_NO_GRAPHICS_LIBRARY = 16;
+
+    /**
+     * DWT error constant indicating that a particular feature has
+     * not been implemented on this platform
+     * (value is 20).
+     */
+    public static const int ERROR_NOT_IMPLEMENTED = 20;
+
+    /**
+     * DWT error constant indicating that a menu which needed
+     * to have the drop down style had some other style instead
+     * (value is 21).
+     */
+    public static const int ERROR_MENU_NOT_DROP_DOWN = 21;
+
+    /**
+     * DWT error constant indicating that an attempt was made to
+     * invoke an DWT operation which can only be executed by the
+     * user-interface thread from some other thread
+     * (value is 22).
+     */
+    public static const int ERROR_THREAD_INVALID_ACCESS = 22;
+
+    /**
+     * DWT error constant indicating that an attempt was made to
+     * invoke an DWT operation using a widget which had already
+     * been disposed
+     * (value is 24).
+     */
+    public static const int ERROR_WIDGET_DISPOSED = 24;
+
+    /**
+     * DWT error constant indicating that a menu item which needed
+     * to have the cascade style had some other style instead
+     * (value is 27).
+     */
+    public static const int ERROR_MENUITEM_NOT_CASCADE = 27;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to set the selection of a widget
+     * (value is 28).
+     */
+    public static const int ERROR_CANNOT_SET_SELECTION = 28;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to set the menu
+     * (value is 29).
+     */
+    public static const int ERROR_CANNOT_SET_MENU = 29;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to set the enabled state
+     * (value is 30).
+     */
+    public static const int ERROR_CANNOT_SET_ENABLED = 30;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide enabled/disabled state information
+     * (value is 31).
+     */
+    public static const int ERROR_CANNOT_GET_ENABLED = 31;
+
+    /**
+     * DWT error constant indicating that a provided widget can
+     * not be used as a parent in the current operation
+     * (value is 32).
+     */
+    public static const int ERROR_INVALID_PARENT = 32;
+
+    /**
+     * DWT error constant indicating that a menu which needed
+     * to have the menu bar style had some other style instead
+     * (value is 33).
+     */
+    public static const int ERROR_MENU_NOT_BAR = 33;
+
+    /**
+     * DWT error constant indicating that the underlying operating
+     * system was unable to provide count information
+     * (value is 36).
+     */
+    public static const int ERROR_CANNOT_GET_COUNT = 36;
+
+    /**
+     * DWT error constant indicating that a menu which needed
+     * to have the pop up menu style had some other style instead
+     * (value is 37).
+     */
+    public static const int ERROR_MENU_NOT_POP_UP = 37;
+
+    /**
+     * DWT error constant indicating that a graphics operation
+     * was attempted with an image of an unsupported depth
+     * (value is 38).
+     */
+    public static const int ERROR_UNSUPPORTED_DEPTH = 38;
+
+    /**
+     * DWT error constant indicating that an input/output operation
+     * failed during the execution of an DWT operation
+     * (value is 39).
+     */
+    public static const int ERROR_IO = 39;
+
+    /**
+     * DWT error constant indicating that a graphics operation
+     * was attempted with an image having an invalid format
+     * (value is 40).
+     */
+    public static const int ERROR_INVALID_IMAGE = 40;
+
+    /**
+     * DWT error constant indicating that a graphics operation
+     * was attempted with an image having a valid but unsupported
+     * format
+     * (value is 42).
+     */
+    public static const int ERROR_UNSUPPORTED_FORMAT = 42;
+
+    /**
+     * DWT error constant indicating that an attempt was made
+     * to subclass an DWT widget class without implementing the
+     * <code>checkSubclass()</code> method
+     * (value is 43).
+     *
+     * For additional information see the comment in
+     * <code>Widget.checkSubclass()</code>.
+     *
+     * @see dwt.widgets.Widget#checkSubclass
+     */
+    public static const int ERROR_INVALID_SUBCLASS = 43;
+
+    /**
+     * DWT error constant indicating that an attempt was made to
+     * invoke an DWT operation using a graphics object which had
+     * already been disposed
+     * (value is 44).
+     */
+    public static const int ERROR_GRAPHIC_DISPOSED = 44;
+
+    /**
+     * DWT error constant indicating that an attempt was made to
+     * invoke an DWT operation using a device which had already
+     * been disposed
+     * (value is 45).
+     */
+    public static const int ERROR_DEVICE_DISPOSED = 45;
+
+    /**
+     * DWT error constant indicating that an exception happened
+     * when executing a runnable
+     * (value is 46).
+     */
+    public static const int ERROR_FAILED_EXEC = 46;
+
+    /**
+     * DWT error constant indicating that an unsatisfied link
+     * error occurred while attempting to load a library
+     * (value is 47).
+     *
+     * @since 3.1
+     */
+    public static const int ERROR_FAILED_LOAD_LIBRARY = 47;
+
+    /**
+     * DWT error constant indicating that a font is not valid
+     * (value is 48).
+     *
+     * @since 3.1
+     */
+    public static const int ERROR_INVALID_FONT = 48;
+
+    /**
+     * Constant indicating that an image or operation is of type bitmap  (value is 0).
+     */
+    public static const int BITMAP = 0;
+
+    /**
+     * Constant indicating that an image or operation is of type icon  (value is 1).
+     */
+    public static const int ICON = 1;
+
+    /**
+     * The <code>Image</code> constructor argument indicating that
+     * the new image should be a copy of the image provided as
+     * an argument  (value is 0).
+     */
+    public static const int IMAGE_COPY = 0;
+
+    /**
+     * The <code>Image</code> constructor argument indicating that
+     * the new image should have the appearance of a "disabled"
+     * (using the platform's rules for how this should look)
+     * copy of the image provided as an argument  (value is 1).
+     */
+    public static const int IMAGE_DISABLE = 1;
+
+    /**
+     * The <code>Image</code> constructor argument indicating that
+     * the new image should have the appearance of a "gray scaled"
+     * copy of the image provided as an argument  (value is 2).
+     */
+    public static const int IMAGE_GRAY = 2;
+
+    /**
+     * The font style constant indicating a normal weight, non-italic font
+     * (value is 0).
+     */
+    public static const int NORMAL = 0;
+
+    /**
+     * The font style constant indicating a bold weight font
+     * (value is 1&lt;&lt;0).
+     */
+    public static const int BOLD = 1 << 0;
+
+    /**
+     * The font style constant indicating an italic font
+     * (value is 1&lt;&lt;1).
+     */
+    public static const int ITALIC = 1 << 1;
+
+    /**
+     * System arrow cursor  (value is 0).
+     */
+    public static const int CURSOR_ARROW = 0;
+
+    /**
+     * System wait cursor  (value is 1).
+     */
+    public static const int CURSOR_WAIT = 1;
+
+    /**
+     * System cross hair cursor  (value is 2).
+     */
+    public static const int CURSOR_CROSS = 2;
+
+    /**
+     * System app startup cursor  (value is 3).
+     */
+    public static const int CURSOR_APPSTARTING = 3;
+
+    /**
+     * System help cursor  (value is 4).
+     */
+    public static const int CURSOR_HELP = 4;
+
+    /**
+     * System resize all directions cursor (value is 5).
+     */
+    public static const int CURSOR_SIZEALL = 5;
+
+    /**
+     * System resize north-east-south-west cursor  (value is 6).
+     */
+    public static const int CURSOR_SIZENESW = 6;
+
+    /**
+     * System resize north-south cursor  (value is 7).
+     */
+    public static const int CURSOR_SIZENS = 7;
+
+    /**
+     * System resize north-west-south-east cursor  (value is 8).
+     */
+    public static const int CURSOR_SIZENWSE = 8;
+
+    /**
+     * System resize west-east cursor  (value is 9).
+     */
+    public static const int CURSOR_SIZEWE = 9;
+
+    /**
+     * System resize north cursor  (value is 10).
+     */
+    public static const int CURSOR_SIZEN = 10;
+
+    /**
+     * System resize south cursor  (value is 11).
+     */
+    public static const int CURSOR_SIZES = 11;
+
+    /**
+     * System resize east cursor  (value is 12).
+     */
+    public static const int CURSOR_SIZEE = 12;
+
+    /**
+     * System resize west cursor  (value is 13).
+     */
+    public static const int CURSOR_SIZEW = 13;
+
+    /**
+     * System resize north-east cursor (value is 14).
+     */
+    public static const int CURSOR_SIZENE = 14;
+
+    /**
+     * System resize south-east cursor (value is 15).
+     */
+    public static const int CURSOR_SIZESE = 15;
+
+    /**
+     * System resize south-west cursor (value is 16).
+     */
+    public static const int CURSOR_SIZESW = 16;
+
+    /**
+     * System resize north-west cursor (value is 17).
+     */
+    public static const int CURSOR_SIZENW = 17;
+
+    /**
+     * System up arrow cursor  (value is 18).
+     */
+    public static const int CURSOR_UPARROW = 18;
+
+    /**
+     * System i-beam cursor (value is 19).
+     */
+    public static const int CURSOR_IBEAM = 19;
+
+    /**
+     * System "not allowed" cursor (value is 20).
+     */
+    public static const int CURSOR_NO = 20;
+
+    /**
+     * System hand cursor (value is 21).
+     */
+    public static const int CURSOR_HAND = 21;
+
+    /**
+     * Line drawing style for flat end caps (value is 1).
+     *
+     * @see dwt.graphics.GC#setLineCap(int)
+     * @see dwt.graphics.GC#getLineCap()
+     *
+     * @since 3.1
+     */
+    public static const int CAP_FLAT = 1;
+
+    /**
+     * Line drawing style for rounded end caps (value is 2).
+     *
+     * @see dwt.graphics.GC#setLineCap(int)
+     * @see dwt.graphics.GC#getLineCap()
+     *
+     * @since 3.1
+     */
+    public static const int CAP_ROUND = 2;
+
+    /**
+     * Line drawing style for square end caps (value is 3).
+     *
+     * @see dwt.graphics.GC#setLineCap(int)
+     * @see dwt.graphics.GC#getLineCap()
+     *
+     * @since 3.1
+     */
+    public static const int CAP_SQUARE = 3;
+
+    /**
+     * Line drawing style for miter joins (value is 1).
+     *
+     * @see dwt.graphics.GC#setLineJoin(int)
+     * @see dwt.graphics.GC#getLineJoin()
+     *
+     * @since 3.1
+     */
+    public static const int JOIN_MITER = 1;
+
+    /**
+     * Line drawing  style for rounded joins (value is 2).
+     *
+     * @see dwt.graphics.GC#setLineJoin(int)
+     * @see dwt.graphics.GC#getLineJoin()
+     *
+     * @since 3.1
+     */
+    public static const int JOIN_ROUND = 2;
+
+    /**
+     * Line drawing style for bevel joins (value is 3).
+     *
+     * @see dwt.graphics.GC#setLineJoin(int)
+     * @see dwt.graphics.GC#getLineJoin()
+     *
+     * @since 3.1
+     */
+    public static const int JOIN_BEVEL = 3;
+
+    /**
+     * Line drawing style for solid lines  (value is 1).
+     */
+    public static const int LINE_SOLID = 1;
+
+    /**
+     * Line drawing style for dashed lines (value is 2).
+     */
+    public static const int LINE_DASH = 2;
+
+    /**
+     * Line drawing style for dotted lines (value is 3).
+     */
+    public static const int LINE_DOT = 3;
+
+    /**
+     * Line drawing style for alternating dash-dot lines (value is 4).
+     */
+    public static const int LINE_DASHDOT = 4;
+
+    /**
+     * Line drawing style for dash-dot-dot lines (value is 5).
+     */
+    public static const int LINE_DASHDOTDOT = 5;
+
+    /**
+     * Line drawing style for custom dashed lines (value is 6).
+     *
+     * @see dwt.graphics.GC#setLineDash(int[])
+     * @see dwt.graphics.GC#getLineDash()
+     *
+     * @since 3.1
+     */
+    public static const int LINE_CUSTOM = 6;
+
+    /**
+     * Path constant that represents a "move to" operation (value is 1).
+     *
+     * @since 3.1
+     */
+    public static const int PATH_MOVE_TO = 1;
+
+    /**
+     * Path constant that represents a "line to" operation (value is 2).
+     *
+     * @since 3.1
+     */
+    public static const int PATH_LINE_TO = 2;
+
+    /**
+     * Path constant that represents a "quadratic curve to" operation (value is 3).
+     *
+     * @since 3.1
+     */
+    public static const int PATH_QUAD_TO = 3;
+
+    /**
+     * Path constant that represents a "cubic curve to" operation (value is 4).
+     *
+     * @since 3.1
+     */
+    public static const int PATH_CUBIC_TO = 4;
+
+    /**
+     * Path constant that represents a "close" operation (value is 5).
+     *
+     * @since 3.1
+     */
+    public static const int PATH_CLOSE = 5;
+
+    /**
+     * Even odd rule for filling operations (value is 1).
+     *
+     * @since 3.1
+     */
+    public static const int FILL_EVEN_ODD = 1;
+
+    /**
+     * Winding rule for filling operations (value is 2).
+     *
+     * @since 3.1
+     */
+    public static const int FILL_WINDING = 2;
+
+    /**
+     * Image format constant indicating an unknown image type (value is -1).
+     */
+    public static const int IMAGE_UNDEFINED = -1;
+
+    /**
+     * Image format constant indicating a Windows BMP format image (value is 0).
+     */
+    public static const int IMAGE_BMP = 0;
+
+    /**
+     * Image format constant indicating a run-length encoded
+     * Windows BMP format image (value is 1).
+     */
+    public static const int IMAGE_BMP_RLE = 1;
+
+    /**
+     * Image format constant indicating a GIF format image (value is 2).
+     */
+    public static const int IMAGE_GIF = 2;
+
+    /**
+     * Image format constant indicating a ICO format image (value is 3).
+     */
+    public static const int IMAGE_ICO = 3;
+
+    /**
+     * Image format constant indicating a JPEG format image (value is 4).
+     */
+    public static const int IMAGE_JPEG = 4;
+
+    /**
+     * Image format constant indicating a PNG format image (value is 5).
+     */
+    public static const int IMAGE_PNG = 5;
+
+    /**
+     * Image format constant indicating a TIFF format image (value is 6).
+     */
+    public static const int IMAGE_TIFF = 6;
+
+    /**
+     * Image format constant indicating an OS/2 BMP format image (value is 7).
+     */
+    public static const int IMAGE_OS2_BMP = 7;
+
+    /**
+     * GIF image disposal method constants indicating that the
+     * disposal method is unspecified (value is 0).
+     */
+    public static const int DM_UNSPECIFIED = 0x0;
+
+    /**
+     * GIF image disposal method constants indicating that the
+     * disposal method is to do nothing; that is, to leave the
+     * previous image in place (value is 1).
+     */
+    public static const int DM_FILL_NONE = 0x1;
+
+    /**
+     * GIF image disposal method constants indicating that the
+     * the previous images should be covered with the background
+     * color before displaying the next image (value is 2).
+     */
+    public static const int DM_FILL_BACKGROUND = 0x2;
+
+    /**
+     * GIF image disposal method constants indicating that the
+     * disposal method is to restore the previous picture
+     * (value is 3).
+     */
+    public static const int DM_FILL_PREVIOUS = 0x3;
+
+    /**
+     * Image transparency constant indicating that the image
+     * contains no transparency information (value is 0).
+     */
+    public static const int TRANSPARENCY_NONE = 0x0;
+
+    /**
+     * Image transparency constant indicating that the image
+     * contains alpha transparency information (value is 1&lt;&lt;0).
+     */
+    public static const int TRANSPARENCY_ALPHA = 1 << 0;
+
+    /**
+     * Image transparency constant indicating that the image
+     * contains a transparency mask (value is 1&lt;&lt;1).
+     */
+    public static const int TRANSPARENCY_MASK = 1 << 1;
+
+    /**
+     * Image transparency constant indicating that the image
+     * contains a transparent pixel (value is 1&lt;&lt;2).
+     */
+    public static const int TRANSPARENCY_PIXEL = 1 << 2;
+
+    /**
+     * The character movement type (value is 1&lt;&lt;0).
+     * This constant is used to move a text offset over a character.
+     *
+     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
+     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
+     *
+     * @since 3.0
+     */
+    public static const int MOVEMENT_CHAR = 1 << 0;
+
+    /**
+     * The cluster movement type (value is 1&lt;&lt;1).
+     * This constant is used to move a text offset over a cluster.
+     * A cluster groups one or more characters. A cluster is
+     * undivisible, this means that a caret offset can not be placed in the
+     * middle of a cluster.
+     *
+     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
+     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
+     *
+     * @since 3.0
+     */
+    public static const int MOVEMENT_CLUSTER = 1 << 1;
+
+    /**
+     * The word movement type (value is 1&lt;&lt;2).
+     * This constant is used to move a text offset over a word.
+     * The behavior of this constant depends on the platform and on the
+     * direction of the movement. For example, on Windows the stop is
+     * always at the start of the word. On GTK and Mac the stop is at the end
+     * of the word if the direction is next and at the start of the word if the
+     * direction is previous.
+     *
+     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
+     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
+     *
+     * @since 3.0
+     */
+    public static const int MOVEMENT_WORD = 1 << 2;
+
+    /**
+     * The word end movement type (value is 1&lt;&lt;3).
+     * This constant is used to move a text offset to the next or previous
+     * word end. The behavior of this constant does not depend on the platform.
+     *
+     *
+     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
+     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
+     *
+     * @since 3.3
+     */
+    public static const int MOVEMENT_WORD_END = 1 << 3;
+
+    /**
+     * The word start movement type (value is 1&lt;&lt;4).
+     * This constant is used to move a text offset to the next or previous
+     * word start. The behavior of this constant does not depend on the platform.
+     *
+     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
+     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
+     *
+     * @since 3.3
+     */
+    public static const int MOVEMENT_WORD_START = 1 << 4;
+
+
+/**
+ * Answers a concise, human readable description of the error code.
+ *
+ * @param code the DWT error code.
+ * @return a description of the error code.
+ *
+ * @see DWT
+ */
+static char[] findErrorText (int code) {
+    switch (code) {
+        case ERROR_UNSPECIFIED:            return "Unspecified error"; //$NON-NLS-1$
+        case ERROR_NO_HANDLES:             return "No more handles"; //$NON-NLS-1$
+        case ERROR_NO_MORE_CALLBACKS:      return "No more callbacks"; //$NON-NLS-1$
+        case ERROR_NULL_ARGUMENT:          return "Argument cannot be null"; //$NON-NLS-1$
+        case ERROR_INVALID_ARGUMENT:       return "Argument not valid"; //$NON-NLS-1$
+        case ERROR_INVALID_RANGE:          return "Index out of bounds"; //$NON-NLS-1$
+        case ERROR_CANNOT_BE_ZERO:         return "Argument cannot be zero"; //$NON-NLS-1$
+        case ERROR_CANNOT_GET_ITEM:        return "Cannot get item"; //$NON-NLS-1$
+        case ERROR_CANNOT_GET_SELECTION:   return "Cannot get selection"; //$NON-NLS-1$
+        case ERROR_CANNOT_GET_ITEM_HEIGHT: return "Cannot get item height"; //$NON-NLS-1$
+        case ERROR_CANNOT_GET_TEXT:        return "Cannot get text"; //$NON-NLS-1$
+        case ERROR_CANNOT_SET_TEXT:        return "Cannot set text"; //$NON-NLS-1$
+        case ERROR_ITEM_NOT_ADDED:         return "Item not added"; //$NON-NLS-1$
+        case ERROR_ITEM_NOT_REMOVED:       return "Item not removed"; //$NON-NLS-1$
+        case ERROR_NOT_IMPLEMENTED:        return "Not implemented"; //$NON-NLS-1$
+        case ERROR_MENU_NOT_DROP_DOWN:     return "Menu must be a drop down"; //$NON-NLS-1$
+        case ERROR_THREAD_INVALID_ACCESS:  return "Invalid thread access"; //$NON-NLS-1$
+        case ERROR_WIDGET_DISPOSED:        return "Widget is disposed"; //$NON-NLS-1$
+        case ERROR_MENUITEM_NOT_CASCADE:   return "Menu item is not a CASCADE"; //$NON-NLS-1$
+        case ERROR_CANNOT_SET_SELECTION:   return "Cannot set selection";  //$NON-NLS-1$
+        case ERROR_CANNOT_SET_MENU:        return "Cannot set menu";  //$NON-NLS-1$
+        case ERROR_CANNOT_SET_ENABLED:     return "Cannot set the enabled state";  //$NON-NLS-1$
+        case ERROR_CANNOT_GET_ENABLED:     return "Cannot get the enabled state";  //$NON-NLS-1$
+        case ERROR_INVALID_PARENT:         return "Widget has the wrong parent";  //$NON-NLS-1$
+        case ERROR_MENU_NOT_BAR:           return "Menu is not a BAR";  //$NON-NLS-1$
+        case ERROR_CANNOT_GET_COUNT:       return "Cannot get count"; //$NON-NLS-1$
+        case ERROR_MENU_NOT_POP_UP:        return "Menu is not a POP_UP"; //$NON-NLS-1$
+        case ERROR_UNSUPPORTED_DEPTH:      return "Unsupported color depth"; //$NON-NLS-1$
+        case ERROR_IO:                     return "i/o error"; //$NON-NLS-1$
+        case ERROR_INVALID_IMAGE:          return "Invalid image"; //$NON-NLS-1$
+        case ERROR_UNSUPPORTED_FORMAT:     return "Unsupported or unrecognized format"; //$NON-NLS-1$
+        case ERROR_INVALID_SUBCLASS:       return "Subclassing not allowed"; //$NON-NLS-1$
+        case ERROR_GRAPHIC_DISPOSED:       return "Graphic is disposed"; //$NON-NLS-1$
+        case ERROR_DEVICE_DISPOSED:        return "Device is disposed"; //$NON-NLS-1$
+        case ERROR_FAILED_EXEC:            return "Failed to execute runnable"; //$NON-NLS-1$
+        case ERROR_FAILED_LOAD_LIBRARY:    return "Unable to load library"; //$NON-NLS-1$
+        case ERROR_CANNOT_INVERT_MATRIX:    return "Cannot invert matrix"; //$NON-NLS-1$
+        case ERROR_NO_GRAPHICS_LIBRARY:    return "Unable to load graphics library"; //$NON-NLS-1$
+        case ERROR_INVALID_FONT:            return "Font not valid"; //$NON-NLS-1$
+        default:
+    }
+    return "Unknown error"; //$NON-NLS-1$
+}
+
+
+/**
+ * Returns the NLS'ed message for the given argument.
+ *
+ * @param key the key to look up
+ * @return the message for the given key
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
+ * </ul>
+ */
+public static char[] getMessage(char[] key) {
+    // PORTING_FIXME: Implement
+    return "msg not found";
+    //return Compatibility.getMessage(key);
+}
+
+/**
+ * Returns the DWT platform name.
+ * Examples: "win32", "motif", "gtk", "photon", "carbon"
+ *
+ * @return the DWT platform name
+ */
+public static char[] getPlatform () {
+    return Platform.PLATFORM;
+}
+
+/**
+ * Returns the DWT version number as an integer.
+ * Example: "SWT051" == 51
+ *
+ * @return the DWT version number
+ */
+public static int getVersion () {
+    return Library.SWT_VERSION;
+}
+
+/**
+ * Throws an appropriate exception based on the passed in error code.
+ *
+ * @param code the DWT error code
+ */
+public static void error (int code) {
+    error (code, null);
+}
+
+/**
+ * Throws an appropriate exception based on the passed in error code.
+ * The <code>throwable</code> argument should be either null, or the
+ * throwable which caused DWT to throw an exception.
+ * <p>
+ * In DWT, errors are reported by throwing one of three exceptions:
+ * <dl>
+ * <dd>java.lang.IllegalArgumentException</dd>
+ * <dt>thrown whenever one of the API methods is invoked with an illegal argument</dt>
+ * <dd>dwt.DWTException (extends java.lang.RuntimeException)</dd>
+ * <dt>thrown whenever a recoverable error happens internally in DWT</dt>
+ * <dd>dwt.DWTError (extends java.lang.Error)</dd>
+ * <dt>thrown whenever a <b>non-recoverable</b> error happens internally in DWT</dt>
+ * </dl>
+ * This method provides the logic which maps between error codes
+ * and one of the above exceptions.
+ * </p>
+ *
+ * @param code the DWT error code.
+ * @param throwable the exception which caused the error to occur.
+ *
+ * @see DWTError
+ * @see DWTException
+ * @see IllegalArgumentException
+ */
+public static void error (int code, TracedException throwable) {
+    error (code, throwable, null);
+}
+
+/**
+ * Throws an appropriate exception based on the passed in error code.
+ * The <code>throwable</code> argument should be either null, or the
+ * throwable which caused DWT to throw an exception.
+ * <p>
+ * In DWT, errors are reported by throwing one of three exceptions:
+ * <dl>
+ * <dd>java.lang.IllegalArgumentException</dd>
+ * <dt>thrown whenever one of the API methods is invoked with an illegal argument</dt>
+ * <dd>dwt.DWTException (extends java.lang.RuntimeException)</dd>
+ * <dt>thrown whenever a recoverable error happens internally in DWT</dt>
+ * <dd>dwt.DWTError (extends java.lang.Error)</dd>
+ * <dt>thrown whenever a <b>non-recoverable</b> error happens internally in DWT</dt>
+ * </dl>
+ * This method provides the logic which maps between error codes
+ * and one of the above exceptions.
+ * </p>
+ *
+ * @param code the DWT error code.
+ * @param throwable the exception which caused the error to occur.
+ * @param detail more information about error.
+ *
+ * @see DWTError
+ * @see DWTException
+ * @see IllegalArgumentException
+ *
+ * @since 3.0
+ */
+public static void error (int code, TracedException throwable, char[] detail) {
+
+    /*
+    * This code prevents the creation of "chains" of SWTErrors and
+    * SWTExceptions which in turn contain other SWTErrors and
+    * SWTExceptions as their throwable. This can occur when low level
+    * code throws an exception past a point where a higher layer is
+    * being "safe" and catching all exceptions. (Note that, this is
+    * _a_bad_thing_ which we always try to avoid.)
+    *
+    * On the theory that the low level code is closest to the
+    * original problem, we simply re-throw the original exception here.
+    *
+    * NOTE: Exceptions thrown in syncExec and asyncExec must be
+    * wrapped.
+    */
+    if (code != DWT.ERROR_FAILED_EXEC) {
+        if (auto t = cast(DWTError)throwable) throw t;
+        if (auto t = cast(DWTException)throwable) throw t;
+    }
+
+    char[] message = findErrorText (code);
+    if (detail != null) message ~= detail;
+    switch (code) {
+
+        /* Illegal Arguments (non-fatal) */
+        case ERROR_NULL_ARGUMENT:
+        case ERROR_CANNOT_BE_ZERO:
+        case ERROR_INVALID_ARGUMENT:
+        case ERROR_MENU_NOT_BAR:
+        case ERROR_MENU_NOT_DROP_DOWN:
+        case ERROR_MENU_NOT_POP_UP:
+        case ERROR_MENUITEM_NOT_CASCADE:
+        case ERROR_INVALID_PARENT:
+        case ERROR_INVALID_RANGE: {
+            throw new IllegalArgumentException (message);
+        }
+
+        /* DWT Exceptions (non-fatal) */
+        case ERROR_INVALID_SUBCLASS:
+        case ERROR_THREAD_INVALID_ACCESS:
+        case ERROR_WIDGET_DISPOSED:
+        case ERROR_GRAPHIC_DISPOSED:
+        case ERROR_DEVICE_DISPOSED:
+        case ERROR_INVALID_IMAGE:
+        case ERROR_UNSUPPORTED_DEPTH:
+        case ERROR_UNSUPPORTED_FORMAT:
+        case ERROR_FAILED_EXEC:
+        case ERROR_CANNOT_INVERT_MATRIX:
+        case ERROR_NO_GRAPHICS_LIBRARY:
+        case ERROR_IO: {
+            DWTException exception = new DWTException (code, message);
+            exception.throwable = throwable;
+            throw exception;
+        }
+
+        /* Operation System Errors (fatal, may occur only on some platforms) */
+        case ERROR_CANNOT_GET_COUNT:
+        case ERROR_CANNOT_GET_ENABLED:
+        case ERROR_CANNOT_GET_ITEM:
+        case ERROR_CANNOT_GET_ITEM_HEIGHT:
+        case ERROR_CANNOT_GET_SELECTION:
+        case ERROR_CANNOT_GET_TEXT:
+        case ERROR_CANNOT_SET_ENABLED:
+        case ERROR_CANNOT_SET_MENU:
+        case ERROR_CANNOT_SET_SELECTION:
+        case ERROR_CANNOT_SET_TEXT:
+        case ERROR_ITEM_NOT_ADDED:
+        case ERROR_ITEM_NOT_REMOVED:
+        case ERROR_NO_HANDLES:
+        //FALL THROUGH
+
+        /* DWT Errors (fatal, may occur only on some platforms) */
+        case ERROR_FAILED_LOAD_LIBRARY:
+        case ERROR_NO_MORE_CALLBACKS:
+        case ERROR_NOT_IMPLEMENTED:
+        case ERROR_UNSPECIFIED: {
+            DWTError error = new DWTError (code, message);
+            error.throwable = throwable;
+            throw error;
+        }
+        default:
+    }
+
+    /* Unknown/Undefined Error */
+    DWTError error = new DWTError (code, message);
+    error.throwable = throwable;
+    throw error;
+}
+
+public static void static_this() {
+    /*
+    * These values represent bit masks that may need to
+    * expand in the future.  Therefore they are not initialized
+    * in the declaration to stop the compiler from inlining.
+    */
+    BUTTON_MASK = BUTTON1 | BUTTON2 | BUTTON3 | BUTTON4 | BUTTON5;
+    MODIFIER_MASK = ALT | SHIFT | CTRL | COMMAND;
+
+    /*
+    * These values can be different on different platforms.
+    * Therefore they are not initialized in the declaration
+    * to stop the compiler from inlining.
+    */
+    char[] platform = getPlatform ();
+    if ("carbon" == platform ) { //$NON-NLS-1$
+        MOD1 = COMMAND;
+        MOD2 = SHIFT;
+        MOD3 = ALT;
+        MOD4 = CONTROL;
+    } else {
+        MOD1 = CONTROL;
+        MOD2 = SHIFT;
+        MOD3 = ALT;
+        MOD4 = 0;
+    }
+}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/DWTError.d	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.DWTError;
+
+import dwt.DWT;
+
+import tango.core.Exception;
+import tango.io.Stdout;
+
+/**
+ * This error is thrown whenever an unrecoverable error
+ * occurs internally in DWT. The message text and error code
+ * provide a further description of the problem. The exception
+ * has a <code>throwable</code> field which holds the underlying
+ * throwable that caused the problem (if this information is
+ * available (i.e. it may be null)).
+ * <p>
+ * SWTErrors are thrown when something fails internally which
+ * either leaves DWT in an unknown state (eg. the o/s call to
+ * remove an item from a list returns an error code) or when DWT
+ * is left in a known-to-be-unrecoverable state (eg. it runs out
+ * of callback resources). SWTErrors should not occur in typical
+ * programs, although "high reliability" applications should
+ * still catch them.
+ * </p><p>
+ * This class also provides support methods used by DWT to match
+ * error codes to the appropriate exception class (DWTError,
+ * DWTException, or IllegalArgumentException) and to provide
+ * human readable strings for DWT error codes.
+ * </p>
+ *
+ * @see DWTException
+ * @see DWT#error(int)
+ */
+
+public class DWTError : PlatformException {
+    /**
+     * The DWT error code, one of DWT.ERROR_*.
+     */
+    public int code;
+
+    /**
+     * The underlying throwable that caused the problem,
+     * or null if this information is not available.
+     */
+    public TracedException throwable;
+
+    //static final long serialVersionUID = 3833467327105808433L;
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace filled in. The error code is set to an
+ * unspecified value.
+ */
+public this () {
+    this (DWT.ERROR_UNSPECIFIED);
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace and message filled in. The error code is
+ * set to an unspecified value.  Specifying <code>null</code>
+ * as the message is equivalent to specifying an empty string.
+ *
+ * @param message the detail message for the exception
+ */
+public this (char[] message) {
+    this (DWT.ERROR_UNSPECIFIED, message);
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace and error code filled in.
+ *
+ * @param code the DWT error code
+ */
+public this (int code) {
+    this (code, DWT.findErrorText (code));
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace, error code and message filled in.
+ * Specifying <code>null</code> as the message is
+ * equivalent to specifying an empty string.
+ *
+ * @param code the DWT error code
+ * @param message the detail message for the exception
+ */
+public this (int code, char[] message) {
+    super (message);
+    this.code = code;
+}
+
+/**
+ * Returns the underlying throwable that caused the problem,
+ * or null if this information is not available.
+ * <p>
+ * NOTE: This method overrides Throwable.getCause() that was
+ * added to JDK1.4. It is necessary to override this method
+ * in order for inherited printStackTrace() methods to work.
+ * </p>
+ * @return the underlying throwable
+ *
+ * @since 3.1
+ */
+public Exception getCause() {
+    return throwable;
+}
+
+/**
+ *  Returns the string describing this DWTError object.
+ *  <p>
+ *  It is combined with the message string of the Throwable
+ *  which caused this DWTError (if this information is available).
+ *  </p>
+ *  @return the error message string of this DWTError object
+ */
+public char[] getMessage () {
+    if (throwable is null)
+        return super.toString();
+    return super.toString () ~ " (" ~ throwable.toString () ~ ")"; //$NON-NLS-1$ //$NON-NLS-2$
+}
+
+/**
+ * Outputs a printable representation of this error's
+ * stack trace on the standard error stream.
+ * <p>
+ * Note: printStackTrace(PrintStream) and printStackTrace(PrintWriter)
+ * are not provided in order to maintain compatibility with CLDC.
+ * </p>
+ */
+public void printStackTrace () {
+    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
+    foreach( msg; this ){
+        Stderr.formatln( "{}", msg );
+    }
+    if ( throwable !is null) {
+        Stderr.formatln ("*** Stack trace of contained error ***"); //$NON-NLS-1$
+        foreach( msg; throwable ){
+            Stderr.formatln( "{}", msg );
+        }
+    }
+}
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/DWTException.d	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.DWTException;
+
+import dwt.DWT;
+
+import tango.core.Exception;
+import tango.io.Stdout;
+
+/**
+ * This runtime exception is thrown whenever a recoverable error
+ * occurs internally in DWT. The message text and error code
+ * provide a further description of the problem. The exception
+ * has a <code>throwable</code> field which holds the underlying
+ * exception that caused the problem (if this information is
+ * available (i.e. it may be null)).
+ * <p>
+ * SWTExceptions are thrown when something fails internally,
+ * but DWT is left in a known stable state (eg. a widget call
+ * was made from a non-u/i thread, or there is failure while
+ * reading an Image because the source file was corrupt).
+ * </p>
+ *
+ * @see DWTError
+ */
+
+public class DWTException : TracedException {
+    /**
+     * The DWT error code, one of DWT.ERROR_*.
+     */
+    public int code;
+
+    /**
+     * The underlying throwable that caused the problem,
+     * or null if this information is not available.
+     */
+    public TracedException throwable;
+
+    //static final long serialVersionUID = 3257282552304842547L;
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace filled in. The error code is set to an
+ * unspecified value.
+ */
+public this () {
+    this (DWT.ERROR_UNSPECIFIED);
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace and message filled in. The error code is
+ * set to an unspecified value.  Specifying <code>null</code>
+ * as the message is equivalent to specifying an empty string.
+ *
+ * @param message the detail message for the exception
+ */
+public this (char[] message) {
+    this (DWT.ERROR_UNSPECIFIED, message);
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace and error code filled in.
+ *
+ * @param code the DWT error code
+ */
+public this (int code) {
+    this (code, DWT.findErrorText (code));
+}
+
+/**
+ * Constructs a new instance of this class with its
+ * stack trace, error code and message filled in.
+ * Specifying <code>null</code> as the message is
+ * equivalent to specifying an empty string.
+ *
+ * @param code the DWT error code
+ * @param message the detail message for the exception
+ */
+public this (int code, char[] message) {
+    super (message);
+    this.code = code;
+}
+
+/**
+ * Returns the underlying throwable that caused the problem,
+ * or null if this information is not available.
+ * <p>
+ * NOTE: This method overrides Throwable.getCause() that was
+ * added to JDK1.4. It is necessary to override this method
+ * in order for inherited printStackTrace() methods to work.
+ * </p>
+ * @return the underlying throwable
+ *
+ * @since 3.1
+ */
+public TracedException getCause() {
+    return throwable;
+}
+
+/**
+ *  Returns the string describing this DWTException object.
+ *  <p>
+ *  It is combined with the message string of the Throwable
+ *  which caused this DWTException (if this information is available).
+ *  </p>
+ *  @return the error message string of this DWTException object
+ */
+public char[] getMessage () {
+    if (throwable is null) return super.toString ();
+    return super.toString () ~ " (" ~ throwable.toString () ~ ")"; //$NON-NLS-1$ //$NON-NLS-2$
+}
+
+/**
+ * Outputs a printable representation of this exception's
+ * stack trace on the standard error stream.
+ * <p>
+ * Note: printStackTrace(PrintStream) and printStackTrace(PrintWriter)
+ * are not provided in order to maintain compatibility with CLDC.
+ * </p>
+ */
+public void printStackTrace () {
+    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
+    foreach( msg; this ){
+        Stderr.formatln( "{}", msg );
+    }
+    if ( throwable !is null) {
+        Stderr.formatln ("*** Stack trace of contained exception ***"); //$NON-NLS-1$
+        foreach( msg; throwable ){
+            Stderr.formatln( "{}", msg );
+        }
+    }
+}
+
+}
+
+
--- a/dwt/SWT.d	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3642 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.SWT;
-
-
-import dwt.internal.Compatibility;
-import dwt.internal.Library;
-import dwt.internal.Platform;
-import dwt.SWTError;
-import dwt.SWTException;
-
-public import dwt.dwthelper.utils;
-
-import tango.core.Exception;
-
-/**
- * This class provides access to a small number of SWT system-wide
- * methods, and in addition defines the public constants provided
- * by SWT.
- * <p>
- * By defining constants like UP and DOWN in a single class, SWT
- * can share common names and concepts at the same time minimizing
- * the number of classes, names and constants for the application
- * programmer.
- * </p><p>
- * Note that some of the constants provided by this class represent
- * optional, appearance related aspects of widgets which are available
- * either only on some window systems, or for a differing set of
- * widgets on each window system. These constants are marked
- * as <em>HINT</em>s. The set of widgets which support a particular
- * <em>HINT</em> may change from release to release, although we typically
- * will not withdraw support for a <em>HINT</em> once it is made available.
- * </p>
- */
-
-/* NOTE:
- *   Good javadoc coding style is to put the values of static const
- *   constants in the comments. This reinforces the fact that
- *   consumers are allowed to rely on the value (and they must
- *   since the values are compiled inline in their code). We
- *   can <em>not</em> change the values of these constants between
- *   releases.
- */
-public class SWT {
-
-    /* Widget Event Constants */
-
-    /**
-     * The null event type (value is 0).
-     *
-     * @since 3.0
-     */
-    public static const int None = 0;
-
-    /**
-     * The key down event type (value is 1).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addKeyListener
-     * @see dwt.widgets.Tracker#addKeyListener
-     * @see dwt.events.KeyListener#keyPressed
-     * @see dwt.events.KeyEvent
-     */
-    public static const int KeyDown = 1;
-
-    /**
-     * The key up event type (value is 2).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addKeyListener
-     * @see dwt.widgets.Tracker#addKeyListener
-     * @see dwt.events.KeyListener#keyReleased
-     * @see dwt.events.KeyEvent
-     */
-    public static const int KeyUp = 2;
-
-    /**
-     * The mouse down event type (value is 3).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseListener
-     * @see dwt.events.MouseListener#mouseDown
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseDown = 3;
-
-    /**
-     * The mouse up event type (value is 4).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseListener
-     * @see dwt.events.MouseListener#mouseUp
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseUp = 4;
-
-    /**
-     * The mouse move event type (value is 5).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseMoveListener
-     * @see dwt.events.MouseMoveListener#mouseMove
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseMove = 5;
-
-    /**
-     * The mouse enter event type (value is 6).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseTrackListener
-     * @see dwt.events.MouseTrackListener#mouseEnter
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseEnter = 6;
-
-    /**
-     * The mouse exit event type (value is 7).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseTrackListener
-     * @see dwt.events.MouseTrackListener#mouseExit
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseExit = 7;
-
-    /**
-     * The mouse double click event type (value is 8).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseListener
-     * @see dwt.events.MouseListener#mouseDoubleClick
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseDoubleClick = 8;
-
-    /**
-     * The paint event type (value is 9).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addPaintListener
-     * @see dwt.events.PaintListener#paintControl
-     * @see dwt.events.PaintEvent
-     */
-    public static const int Paint = 9;
-
-    /**
-     * The move event type (value is 10).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addControlListener
-     * @see dwt.widgets.TableColumn#addControlListener
-     * @see dwt.widgets.Tracker#addControlListener
-     * @see dwt.widgets.TreeColumn#addControlListener
-     * @see dwt.events.ControlListener#controlMoved
-     * @see dwt.events.ControlEvent
-     */
-    public static const int Move = 10;
-
-    /**
-     * The resize event type (value is 11).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addControlListener
-     * @see dwt.widgets.TableColumn#addControlListener
-     * @see dwt.widgets.Tracker#addControlListener
-     * @see dwt.widgets.TreeColumn#addControlListener
-     * @see dwt.events.ControlListener#controlResized
-     * @see dwt.events.ControlEvent
-     */
-    public static const int Resize = 11;
-
-    /**
-     * The dispose event type (value is 12).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Widget#addDisposeListener
-     * @see dwt.events.DisposeListener#widgetDisposed
-     * @see dwt.events.DisposeEvent
-     */
-    public static const int Dispose = 12;
-
-    /**
-     * The selection event type (value is 13).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Button#addSelectionListener
-     * @see dwt.widgets.Combo#addSelectionListener
-     * @see dwt.widgets.CoolItem#addSelectionListener
-     * @see dwt.widgets.Link#addSelectionListener
-     * @see dwt.widgets.List#addSelectionListener
-     * @see dwt.widgets.MenuItem#addSelectionListener
-     * @see dwt.widgets.Sash#addSelectionListener
-     * @see dwt.widgets.Scale#addSelectionListener
-     * @see dwt.widgets.ScrollBar#addSelectionListener
-     * @see dwt.widgets.Slider#addSelectionListener
-     * @see dwt.widgets.TabFolder#addSelectionListener
-     * @see dwt.widgets.Table#addSelectionListener
-     * @see dwt.widgets.TableColumn#addSelectionListener
-     * @see dwt.widgets.ToolItem#addSelectionListener
-     * @see dwt.widgets.TrayItem#addSelectionListener
-     * @see dwt.widgets.Tree#addSelectionListener
-     * @see dwt.widgets.TreeColumn#addSelectionListener
-     * @see dwt.events.SelectionListener#widgetSelected
-     * @see dwt.events.SelectionEvent
-     */
-    public static const int Selection = 13;
-
-    /**
-     * The default selection event type (value is 14).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Combo#addSelectionListener
-     * @see dwt.widgets.List#addSelectionListener
-     * @see dwt.widgets.Spinner#addSelectionListener
-     * @see dwt.widgets.Table#addSelectionListener
-     * @see dwt.widgets.Text#addSelectionListener
-     * @see dwt.widgets.TrayItem#addSelectionListener
-     * @see dwt.widgets.Tree#addSelectionListener
-     * @see dwt.events.SelectionListener#widgetDefaultSelected
-     * @see dwt.events.SelectionEvent
-     */
-    public static const int DefaultSelection = 14;
-
-    /**
-     * The focus in event type (value is 15).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addFocusListener
-     * @see dwt.events.FocusListener#focusGained
-     * @see dwt.events.FocusEvent
-     */
-    public static const int FocusIn = 15;
-
-    /**
-     * The focus out event type (value is 16).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addFocusListener
-     * @see dwt.events.FocusListener#focusLost
-     * @see dwt.events.FocusEvent
-     */
-    public static const int FocusOut = 16;
-
-    /**
-     * The expand event type (value is 17).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Tree#addTreeListener
-     * @see dwt.events.TreeListener#treeExpanded
-     * @see dwt.events.TreeEvent
-     */
-    public static const int Expand = 17;
-
-    /**
-     * The collapse event type (value is 18).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Tree#addTreeListener
-     * @see dwt.events.TreeListener#treeCollapsed
-     * @see dwt.events.TreeEvent
-     */
-    public static const int Collapse = 18;
-
-    /**
-     * The iconify event type (value is 19).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Shell#addShellListener
-     * @see dwt.events.ShellListener#shellIconified
-     * @see dwt.events.ShellEvent
-     */
-    public static const int Iconify = 19;
-
-    /**
-     * The de-iconify event type (value is 20).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Shell#addShellListener
-     * @see dwt.events.ShellListener#shellDeiconified
-     * @see dwt.events.ShellEvent
-     */
-    public static const int Deiconify = 20;
-
-    /**
-     * The close event type (value is 21).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Shell#addShellListener
-     * @see dwt.events.ShellListener#shellClosed
-     * @see dwt.events.ShellEvent
-     */
-    public static const int Close = 21;
-
-    /**
-     * The show event type (value is 22).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Menu#addMenuListener
-     * @see dwt.events.MenuListener#menuShown
-     * @see dwt.events.MenuEvent
-     */
-    public static const int Show = 22;
-
-    /**
-     * The hide event type (value is 23).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Menu#addMenuListener
-     * @see dwt.events.MenuListener#menuHidden
-     * @see dwt.events.MenuEvent
-     */
-    public static const int Hide = 23;
-
-    /**
-     * The modify event type (value is 24).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Combo#addModifyListener
-     * @see dwt.widgets.Spinner#addModifyListener
-     * @see dwt.widgets.Text#addModifyListener
-     * @see dwt.events.ModifyListener#modifyText
-     * @see dwt.events.ModifyEvent
-     */
-    public static const int Modify = 24;
-
-    /**
-     * The verify event type (value is 25).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Combo#addVerifyListener
-     * @see dwt.widgets.Text#addVerifyListener
-     * @see dwt.events.VerifyListener#verifyText
-     * @see dwt.events.VerifyEvent
-     */
-    public static const int Verify = 25;
-
-    /**
-     * The activate event type (value is 26).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Shell#addShellListener
-     * @see dwt.events.ShellListener#shellActivated
-     * @see dwt.events.ShellEvent
-     */
-    public static const int Activate = 26;
-
-    /**
-     * The deactivate event type (value is 27).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Shell#addShellListener
-     * @see dwt.events.ShellListener#shellDeactivated
-     * @see dwt.events.ShellEvent
-     */
-    public static const int Deactivate = 27;
-
-    /**
-     * The help event type (value is 28).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addHelpListener
-     * @see dwt.widgets.Menu#addHelpListener
-     * @see dwt.widgets.MenuItem#addHelpListener
-     * @see dwt.events.HelpListener#helpRequested
-     * @see dwt.events.HelpEvent
-     */
-    public static const int Help = 28;
-
-    /**
-     * The drag detect event type (value is 29).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.dnd.DragSource
-     */
-    public static const int DragDetect = 29;
-
-    /**
-     * The arm event type (value is 30).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.MenuItem#addArmListener
-     * @see dwt.events.ArmListener#widgetArmed
-     * @see dwt.events.ArmEvent
-     */
-    public static const int Arm = 30;
-
-    /**
-     * The traverse event type (value is 31).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addTraverseListener
-     * @see dwt.events.TraverseListener#keyTraversed
-     * @see dwt.events.TraverseEvent
-     */
-    public static const int Traverse = 31;
-
-    /**
-     * The mouse hover event type (value is 32).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Control#addMouseTrackListener
-     * @see dwt.events.MouseTrackListener#mouseHover
-     * @see dwt.events.MouseEvent
-     */
-    public static const int MouseHover = 32;
-
-    /**
-     * The hardware key down event type (value is 33).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     */
-    public static const int HardKeyDown = 33;
-
-    /**
-     * The hardware key up event type (value is 34).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     */
-    public static const int HardKeyUp = 34;
-
-    /**
-     * The menu detect event type (value is 35).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @since 3.0
-     */
-    public static const int MenuDetect = 35;
-
-    /**
-     * The set data event type (value is 36).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @see dwt.widgets.Table
-     * @see dwt.widgets.Tree
-     *
-     * @since 3.0
-     */
-    public static const int SetData = 36;
-
-    /**
-     * The mouse wheel event type (value is 37).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @since 3.1
-     */
-    public static const int MouseWheel = 37;
-
-    /**
-     * The settings changed event type (value is 39).
-     * <p>
-     * The settings changed event is sent when an operating system
-     * property, such as a system font or color, has been changed.
-     * The event occurs after the property has been changed, but
-     * before any widget is redrawn.  Applications that cache operating
-     * system properties can use this event to update their caches.
-     * A specific property change can be detected by querying the
-     * new value of a property and comparing it with the equivalent
-     * cached value.  The operating system automatically redraws and
-     * lays out all widgets after this event is sent.
-     * </p>
-     *
-     * @see dwt.widgets.Display#addListener
-     * @see dwt.widgets.Event
-     *
-     * @since 3.2
-     */
-    public static const int Settings = 39;
-
-    /**
-     * The erase item event type (value is 40).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @since 3.2
-     */
-    public static const int EraseItem = 40;
-
-    /**
-     * The measure item event type (value is 41).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @since 3.2
-     */
-    public static const int MeasureItem = 41;
-
-    /**
-     * The paint item event type (value is 42).
-     *
-     * @see dwt.widgets.Widget#addListener
-     * @see dwt.widgets.Display#addFilter
-     * @see dwt.widgets.Event
-     *
-     * @since 3.2
-     */
-    public static const int PaintItem = 42;
-
-    /* Event Details */
-
-    /**
-     * Indicates that a user-interface component is being dragged,
-     * for example dragging the thumb of a scroll bar (value is 1).
-     */
-    public static const int DRAG = 1;
-
-    /**
-     * Event detail field that indicates a user-interface component
-     * state is selected (value is 1&lt;&lt;1).
-     *
-     * @since 3.2
-     */
-    public static const int SELECTED = 1 << 1;
-
-    /**
-     * Event detail field that indicates a user-interface component
-     * state is focused (value is 1&lt;&lt;2).
-     *
-     * @since 3.2
-     */
-    public static const int FOCUSED = 1 << 2;
-
-    /**
-     * Event detail field that indicates a user-interface component
-     * draws the background (value is 1&lt;&lt;3).
-     *
-     * @since 3.2
-     */
-    public static const int BACKGROUND = 1 << 3;
-
-    /**
-     * Event detail field that indicates a user-interface component
-     * draws the foreground (value is 1&lt;&lt;4).
-     *
-     * @since 3.2
-     */
-    public static const int FOREGROUND = 1 << 4;
-
-    /**
-     * Event detail field that indicates a user-interface component
-     * state is hot (value is 1&lt;&lt;5).
-     *
-     * @since 3.3
-     */
-    public static const int HOT = 1 << 5;
-
-    /* This code is intentionally commented */
-    //public static const int PRESSED = 1 << 3;
-    //public static const int ACTIVE = 1 << 4;
-    //public static const int DISABLED = 1 << 5;
-    //public static const int HOT = 1 << 6;
-    //public static const int DEFAULTED = 1 << 7;
-
-    /**
-     * Traversal event detail field value indicating that no
-     * traversal action should be taken
-     * (value is 0).
-     */
-    public static const int TRAVERSE_NONE = 0;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that a dialog should be cancelled was
-     * pressed; typically, this is the ESC key
-     * (value is 1&lt;&lt;1).
-     */
-    public static const int TRAVERSE_ESCAPE = 1 << 1;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which activates the default button in a dialog was
-     * pressed; typically, this is the ENTER key
-     * (value is 1&lt;&lt;2).
-     */
-    public static const int TRAVERSE_RETURN = 1 << 2;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that focus should be given to the
-     * previous tab group was pressed; typically, this is the
-     * SHIFT-TAB key sequence
-     * (value is 1&lt;&lt;3).
-     */
-    public static const int TRAVERSE_TAB_PREVIOUS = 1 << 3;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that focus should be given to the
-     * next tab group was pressed; typically, this is the
-     * TAB key
-     * (value is 1&lt;&lt;4).
-     */
-    public static const int TRAVERSE_TAB_NEXT = 1 << 4;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that focus should be given to the
-     * previous tab item was pressed; typically, this is either
-     * the LEFT-ARROW or UP-ARROW keys
-     * (value is 1&lt;&lt;5).
-     */
-    public static const int TRAVERSE_ARROW_PREVIOUS = 1 << 5;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that focus should be given to the
-     * previous tab item was pressed; typically, this is either
-     * the RIGHT-ARROW or DOWN-ARROW keys
-     * (value is 1&lt;&lt;6).
-     */
-    public static const int TRAVERSE_ARROW_NEXT = 1 << 6;
-
-    /**
-     * Traversal event detail field value indicating that a
-     * mnemonic key sequence was pressed
-     * (value is 1&lt;&lt;7).
-     */
-    public static const int TRAVERSE_MNEMONIC = 1 << 7;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that the previous page of a multi-page
-     * window should be shown was pressed; typically, this
-     * is the CTRL-PAGEUP key sequence
-     * (value is 1&lt;&lt;8).
-     */
-    public static const int TRAVERSE_PAGE_PREVIOUS = 1 << 8;
-
-    /**
-     * Traversal event detail field value indicating that the
-     * key which designates that the next page of a multi-page
-     * window should be shown was pressed; typically, this
-     * is the CTRL-PAGEDOWN key sequence
-     * (value is 1&lt;&lt;9).
-     */
-    public static const int TRAVERSE_PAGE_NEXT = 1 << 9;
-
-    /**
-     * A constant known to be zero (0), typically used in operations
-     * which take bit flags to indicate that "no bits are set".
-     */
-    public static const int NONE = 0;
-
-    /**
-     * A constant known to be zero (0), used in operations which
-     * take pointers to indicate a null argument.
-     */
-    public static const int NULL = 0;
-
-    /**
-     * Indicates that a default should be used (value is -1).
-     */
-    public static const int DEFAULT = -1;
-
-    /**
-     * Indicates that a property is off (value is 0).
-     *
-     * @since 3.1
-     */
-    public static const int OFF = 0;
-
-    /**
-     * Indicates that a property is on (value is 1).
-     *
-     * @since 3.1
-     */
-    public static const int ON = 1;
-
-    /**
-     * Indicates low quality (value is 1).
-     *
-     * @since 3.1
-     */
-    public static const int LOW = 1;
-
-    /**
-     * Indicates high quality (value is 2).
-     *
-     * @since 3.1
-     */
-    public static const int HIGH = 2;
-
-    /**
-     * Style constant for menu bar behavior (value is 1&lt;&lt;1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Menu</code></li>
-     * </ul></p>
-     */
-    public static const int BAR = 1 << 1;
-
-    /**
-     * Style constant for drop down menu/list behavior (value is 1&lt;&lt;2).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Menu</code></li>
-     * <li><code>ToolItem</code></li>
-     * <li><code>CoolItem</code></li>
-     * <li><code>Combo</code></li>
-     * </ul></p>
-     */
-    public static const int DROP_DOWN = 1 << 2;
-
-    /**
-     * Style constant for pop up menu behavior (value is 1&lt;&lt;3).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Menu</code></li>
-     * </ul></p>
-     */
-    public static const int POP_UP = 1 << 3;
-
-    /**
-     * Style constant for line separator behavior (value is 1&lt;&lt;1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>MenuItem</code></li>
-     * <li><code>ToolItem</code></li>
-     * </ul></p>
-     */
-    public static const int SEPARATOR = 1 << 1;
-
-    /**
-     * Style constant for toggle button behavior (value is 1&lt;&lt;1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * </ul></p>
-     */
-    public static const int TOGGLE = 1 << 1;
-
-    /**
-     * Style constant for arrow button behavior (value is 1&lt;&lt;2).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * </ul></p>
-     */
-    public static const int ARROW = 1 << 2;
-
-    /**
-     * Style constant for push button behavior (value is 1&lt;&lt;3).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>MenuItem</code></li>
-     * <li><code>ToolItem</code></li>
-     * </ul></p>
-     */
-    public static const int PUSH = 1 << 3;
-
-    /**
-     * Style constant for radio button behavior (value is 1&lt;&lt;4).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>MenuItem</code></li>
-     * <li><code>ToolItem</code></li>
-     * </ul></p>
-     */
-    public static const int RADIO = 1 << 4;
-
-    /**
-     * Style constant for check box behavior (value is 1&lt;&lt;5).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>MenuItem</code></li>
-     * <li><code>ToolItem</code></li>
-     * <li><code>Table</code></li>
-     * <li><code>Tree</code></li>
-     * </ul></p>
-     */
-    public static const int CHECK = 1 << 5;
-
-    /**
-     * Style constant for cascade behavior (value is 1&lt;&lt;6).
-     * <p><b>Used By:</b><ul>
-     * <li><code>MenuItem</code></li>
-     * </ul></p>
-     */
-    public static const int CASCADE = 1 << 6;
-
-    /**
-     * Style constant for multi-selection behavior in lists
-     * and multiple line support on text fields (value is 1&lt;&lt;1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Text</code></li>
-     * <li><code>List</code></li>
-     * <li><code>FileDialog</code></li>
-     * </ul></p>
-     */
-    public static const int MULTI = 1 << 1;
-
-    /**
-     * Style constant for single selection behavior in lists
-     * and single line support on text fields (value is 1&lt;&lt;2).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Text</code></li>
-     * <li><code>List</code></li>
-     * <li><code>Table</code></li>
-     * <li><code>Tree</code></li>
-     * </ul></p>
-     */
-    public static const int SINGLE = 1 << 2;
-
-    /**
-     * Style constant for read-only behavior (value is 1&lt;&lt;3).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Combo</code></li>
-     * <li><code>Text</code></li>
-     * </ul></p>
-     */
-    public static const int READ_ONLY = 1 << 3;
-
-    /**
-     * Style constant for automatic line wrap behavior (value is 1&lt;&lt;6).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>Text</code></li>
-     * <li><code>ToolBar</code></li>
-     * <li><code>Spinner</code></li>
-     * </ul></p>
-     */
-    public static const int WRAP = 1 << 6;
-
-    /**
-     * Style constant for search behavior (value is 1&lt;&lt;7).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Text</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int SEARCH = 1 << 7;
-
-    /**
-     * Style constant for simple (not drop down) behavior (value is 1&lt;&lt;6).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Combo</code></li>
-     * </ul></p>
-     */
-    public static const int SIMPLE = 1 << 6;
-
-    /**
-     * Style constant for password behavior (value is 1&lt;&lt;22).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Text</code></li>
-     * </ul></p>
-     *
-     * @since 3.0
-     */
-    public static const int PASSWORD = 1 << 22;
-
-    /**
-     * Style constant for shadow in behavior (value is 1&lt;&lt;2).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>Group</code></li>
-     * </ul></p>
-     */
-    public static const int SHADOW_IN = 1 << 2;
-
-    /**
-     * Style constant for shadow out behavior (value is 1&lt;&lt;3).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>Group</code></li>
-     * <li><code>ToolBar</code></li>
-     * </ul></p>
-     */
-    public static const int SHADOW_OUT = 1 << 3;
-
-    /**
-     * Style constant for shadow etched in behavior (value is 1&lt;&lt;4).
-     * <br>Note that this is a <em>HINT</em>. It is ignored on all platforms except Motif.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Group</code></li>
-     * </ul></p>
-     */
-    public static const int SHADOW_ETCHED_IN = 1 << 4;
-
-    /**
-     * Style constant for shadow etched out behavior (value is 1&lt;&lt;6).
-     * <br>Note that this is a <em>HINT</em>. It is ignored on all platforms except Motif.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Group</code></li>
-     * </ul></p>
-     */
-    public static const int SHADOW_ETCHED_OUT = 1 << 6;
-
-    /**
-     * Style constant for no shadow behavior (value is 1&lt;&lt;5).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>Group</code></li>
-     * </ul></p>
-     */
-    public static const int SHADOW_NONE = 1 << 5;
-
-    /**
-     * Style constant for progress bar behavior (value is 1&lt;&lt;1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>ProgressBar</code></li>
-     * </ul></p>
-     */
-    public static const int INDETERMINATE = 1 << 1;
-
-    /**
-     * Style constant for tool window behavior (value is 1&lt;&lt;2).
-     * <p>
-     * A tool window is a window intended to be used as a floating toolbar.
-     * It typically has a title bar that is shorter than a normal title bar,
-     * and the window title is typically drawn using a smaller font.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p><p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int TOOL = 1 << 2;
-
-    /**
-     * Style constant to ensure no trimmings are used (value is 1&lt;&lt;3).
-     * <br>Note that this overrides all other trim styles.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int NO_TRIM = 1 << 3;
-
-    /**
-     * Style constant for resize box trim (value is 1&lt;&lt;4).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * <li><code>Tracker</code></li>
-     * </ul></p>
-     */
-    public static const int RESIZE = 1 << 4;
-
-    /**
-     * Style constant for title area trim (value is 1&lt;&lt;5).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int TITLE = 1 << 5;
-
-    /**
-     * Style constant for close box trim (value is 1&lt;&lt;6,
-     * since we do not distinguish between CLOSE style and MENU style).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int CLOSE = 1 << 6;
-
-    /**
-     * Style constant for shell menu trim (value is 1&lt;&lt;6,
-     * since we do not distinguish between CLOSE style and MENU style).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int MENU = CLOSE;
-
-    /**
-     * Style constant for minimize box trim (value is 1&lt;&lt;7).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int MIN = 1 << 7;
-
-    /**
-     * Style constant for maximize box trim (value is 1&lt;&lt;10).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Decorations</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int MAX = 1 << 10;
-
-    /**
-     * Style constant for horizontal scrollbar behavior (value is 1&lt;&lt;8).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Scrollable</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int H_SCROLL = 1 << 8;
-
-    /**
-     * Style constant for vertical scrollbar behavior (value is 1&lt;&lt;9).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Scrollable</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int V_SCROLL = 1 << 9;
-
-    /**
-     * Style constant for bordered behavior (value is 1&lt;&lt;11).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int BORDER = 1 << 11;
-
-    /**
-     * Style constant indicating that the window manager should clip
-     * a widget's children with respect to its viewable area. (value is 1&lt;&lt;12).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int CLIP_CHILDREN = 1 << 12;
-
-    /**
-     * Style constant indicating that the window manager should clip
-     * a widget's siblings with respect to its viewable area. (value is 1&lt;&lt;13).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int CLIP_SIBLINGS = 1 << 13;
-
-    /**
-     * Style constant for always on top behavior (value is 1&lt;&lt;14).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Shell</code> and subclasses</li>
-     * </ul></p>
-     */
-    public static const int ON_TOP = 1 << 14;
-
-    /**
-     * Trim style convenience constant for the most common top level shell appearance
-     * (value is CLOSE|TITLE|MIN|MAX|RESIZE).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int SHELL_TRIM = CLOSE | TITLE | MIN | MAX | RESIZE;
-
-    /**
-     * Trim style convenience constant for the most common dialog shell appearance
-     * (value is CLOSE|TITLE|BORDER).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int DIALOG_TRIM = TITLE | CLOSE | BORDER;
-
-    /**
-     * Style constant for modeless behavior (value is 0).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Dialog</code></li>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int MODELESS = 0;
-
-    /**
-     * Style constant for primary modal behavior (value is 1&lt;&lt;15).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Dialog</code></li>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int PRIMARY_MODAL = 1 << 15;
-
-    /**
-     * Style constant for application modal behavior (value is 1&lt;&lt;16).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Dialog</code></li>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int APPLICATION_MODAL = 1 << 16;
-
-    /**
-     * Style constant for system modal behavior (value is 1&lt;&lt;17).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Dialog</code></li>
-     * <li><code>Shell</code></li>
-     * </ul></p>
-     */
-    public static const int SYSTEM_MODAL = 1 << 17;
-
-    /**
-     * Style constant for selection hiding behavior when the widget loses focus (value is 1&lt;&lt;15).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Table</code></li>
-     * </ul></p>
-     */
-    public static const int HIDE_SELECTION = 1 << 15;
-
-    /**
-     * Style constant for full row selection behavior and
-     * selection constant indicating that a full line should be
-     * drawn. (value is 1&lt;&lt;16).
-     * <br>Note that for some widgets this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Table</code></li>
-     * <li><code>Tree</code></li>
-     * <li><code>StyledText</code></li>
-     * <li><code>TextLayout</code></li>
-     * </ul></p>
-     */
-    public static const int FULL_SELECTION = 1 << 16;
-
-    /**
-     * Style constant for flat appearance. (value is 1&lt;&lt;23).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>ToolBar</code></li>
-     * </ul></p>
-     */
-    public static const int FLAT = 1 << 23;
-
-    /**
-     * Style constant for smooth appearance. (value is 1&lt;&lt;16).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>ProgressBar</code></li>
-     * <li><code>Sash</code></li>
-     * </ul></p>
-     */
-    public static const int SMOOTH = 1 << 16;
-
-    /**
-     * Style constant for no background behavior (value is 1&lt;&lt;18).
-     * <p>
-     * By default, before a widget paints, the client area is filled with the current background.
-     * When this style is specified, the background is not filled, and the application is responsible
-     * for filling every pixel of the client area.
-     * This style might be used as an alternative to "double-buffering" in order to reduce flicker.
-     * This style does not mean "transparent" - widgets that are obscured will not draw through.
-     * </p><p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     */
-    public static const int NO_BACKGROUND = 1 << 18;
-
-    /**
-     * Style constant for no focus from the mouse behavior (value is 1&lt;&lt;19).
-     * <br>Note that this is a <em>HINT</em>.
-     * <p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     */
-    public static const int NO_FOCUS = 1 << 19;
-
-    /**
-     * Style constant for no redraw on resize behavior (value is 1&lt;&lt;20).
-     * <p>
-     * This style stops the entire client area from being invalidated when the size
-     * of the Canvas changes. Specifically, when the size of the Canvas gets smaller,
-     * the SWT.Paint event is not sent. When it gets bigger, an SWT.Paint event is
-     * sent with a GC clipped to only the new areas to be painted. Without this
-     * style, the entire client area will be repainted.
-     * </p><p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     */
-    public static const int NO_REDRAW_RESIZE = 1 << 20;
-
-    /**
-     * Style constant for no paint event merging behavior (value is 1&lt;&lt;21).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     */
-    public static const int NO_MERGE_PAINTS = 1 << 21;
-
-    /**
-     * Style constant for preventing child radio group behavior (value is 1&lt;&lt;22).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     */
-    public static const int NO_RADIO_GROUP = 1 << 22;
-
-    /**
-     * Style constant for left to right orientation (value is 1&lt;&lt;25).
-     * <p>
-     * When orientation is not explicitly specified, orientation is
-     * inherited.  This means that children will be assigned the
-     * orientation of their parent.  To override this behavior and
-     * force an orientation for a child, explicitly set the orientation
-     * of the child when that child is created.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * <li><code>Menu</code></li>
-     * <li><code>GC</code></li>
-     * </ul></p>
-     *
-     * @since 2.1.2
-     */
-    public static const int LEFT_TO_RIGHT = 1 << 25;
-
-    /**
-     * Style constant for right to left orientation (value is 1&lt;&lt;26).
-     * <p>
-     * When orientation is not explicitly specified, orientation is
-     * inherited.  This means that children will be assigned the
-     * orientation of their parent.  To override this behavior and
-     * force an orientation for a child, explicitly set the orientation
-     * of the child when that child is created.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * <li><code>Menu</code></li>
-     * <li><code>GC</code></li>
-     * </ul></p>
-     *
-     * @since 2.1.2
-     */
-    public static const int RIGHT_TO_LEFT = 1 << 26;
-
-    /**
-     * Style constant to indicate coordinate mirroring (value is 1&lt;&lt;27).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * <li><code>Menu</code></li>
-     * </ul></p>
-     *
-     * @since 2.1.2
-     */
-    public static const int MIRRORED = 1 << 27;
-
-    /**
-     * Style constant to allow embedding (value is 1&lt;&lt;24).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Composite</code></li>
-     * </ul></p>
-     *
-     * @since 3.0
-     */
-    public static const int EMBEDDED = 1 << 24;
-
-    /**
-     * Style constant to allow virtual data (value is 1&lt;&lt;28).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Table</code></li>
-     * <li><code>Tree</code></li>
-     * </ul></p>
-     *
-     * @since 3.0
-     */
-    public static const int VIRTUAL = 1 << 28;
-
-    /**
-     * Style constant to indicate double buffering (value is 1&lt;&lt;29).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * </ul></p>
-     *
-     * @since 3.1
-     */
-    public static const int DOUBLE_BUFFERED = 1 << 29;
-
-    /**
-     * Style constant for align up behavior (value is 1&lt;&lt;7,
-     * since align UP and align TOP are considered the same).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code> with <code>ARROW</code> style</li>
-     * <li><code>Tracker</code></li>
-     * </ul></p>
-     */
-    public static const int UP = 1 << 7;
-
-    /**
-     * Style constant for align top behavior (value is 1&lt;&lt;7,
-     * since align UP and align TOP are considered the same).
-     * <p><b>Used By:</b><ul>
-     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
-     * </ul></p>
-     */
-    public static const int TOP = UP;
-
-    /**
-     * Style constant for align down behavior (value is 1&lt;&lt;10,
-     * since align DOWN and align BOTTOM are considered the same).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code> with <code>ARROW</code> style</li>
-     * <li><code>Tracker</code></li>
-     * </ul></p>
-     */
-    public static const int DOWN               = 1 << 10;
-
-    /**
-     * Style constant for align bottom behavior (value is 1&lt;&lt;10,
-     * since align DOWN and align BOTTOM are considered the same).
-     * <p><b>Used By:</b><ul>
-     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
-     * </ul></p>
-     */
-    public static const int BOTTOM             = DOWN;
-
-    /**
-     * Style constant for leading alignment (value is 1&lt;&lt;14).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>Label</code></li>
-     * <li><code>TableColumn</code></li>
-     * <li><code>Tracker</code></li>
-     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
-     * </ul></p>
-     *
-     * @since 2.1.2
-     */
-    public static const int LEAD               = 1 << 14;
-
-    /**
-     * Style constant for align left behavior (value is 1&lt;&lt;14).
-     * This is a synonym for LEAD (value is 1&lt;&lt;14).  Newer
-     * applications should use LEAD instead of LEFT to make code more
-     * understandable on right-to-left platforms.
-     */
-    public static const int LEFT               = LEAD;
-
-    /**
-     * Style constant for trailing alignment (value is 1&lt;&lt;17).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>Label</code></li>
-     * <li><code>TableColumn</code></li>
-     * <li><code>Tracker</code></li>
-     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
-     * </ul></p>
-     *
-     * @since 2.1.2
-     */
-    public static const int TRAIL              = 1 << 17;
-
-    /**
-     * Style constant for align right behavior (value is 1&lt;&lt;17).
-     * This is a synonym for TRAIL (value is 1&lt;&lt;17).  Newer
-     * applications should use TRAIL instead of RIGHT to make code more
-     * understandable on right-to-left platforms.
-     */
-    public static const int RIGHT              = TRAIL;
-
-    /**
-     * Style constant for align center behavior (value is 1&lt;&lt;24).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Button</code></li>
-     * <li><code>Label</code></li>
-     * <li><code>TableColumn</code></li>
-     * <li><code>FormAttachment</code> in a <code>FormLayout</code></li>
-     * </ul></p>
-     */
-    public static const int CENTER = 1 << 24;
-
-    /**
-     * Style constant for horizontal alignment or orientation behavior (value is 1&lt;&lt;8).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>ProgressBar</code></li>
-     * <li><code>Sash</code></li>
-     * <li><code>Scale</code></li>
-     * <li><code>ScrollBar</code></li>
-     * <li><code>Slider</code></li>
-     * <li><code>ToolBar</code></li>
-     * <li><code>FillLayout</code> type</li>
-     * <li><code>RowLayout</code> type</li>
-     * </ul></p>
-     */
-    public static const int HORIZONTAL = 1 << 8;
-
-    /**
-     * Style constant for vertical alignment or orientation behavior (value is 1&lt;&lt;9).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Label</code></li>
-     * <li><code>ProgressBar</code></li>
-     * <li><code>Sash</code></li>
-     * <li><code>Scale</code></li>
-     * <li><code>ScrollBar</code></li>
-     * <li><code>Slider</code></li>
-     * <li><code>ToolBar</code></li>
-     * <li><code>CoolBar</code></li>
-     * <li><code>FillLayout</code> type</li>
-     * <li><code>RowLayout</code> type</li>
-     * </ul></p>
-     */
-    public static const int VERTICAL = 1 << 9;
-
-    /**
-     * Style constant for date display (value is 1&lt;&lt;5).
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int DATE = 1 << 5;
-
-    /**
-     * Style constant for time display (value is 1&lt;&lt;7).
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int TIME = 1 << 7;
-
-    /**
-     * Style constant for calendar display (value is 1&lt;&lt;10).
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int CALENDAR = 1 << 10;
-
-    /**
-     * Style constant for short date/time format (value is 1&lt;&lt;15).
-     * <p>
-     * A short date displays the month and year.
-     * A short time displays hours and minutes.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int SHORT = 1 << 15;
-
-    /**
-     * Style constant for medium date/time format (value is 1&lt;&lt;16).
-     * <p>
-     * A medium date displays the day, month and year.
-     * A medium time displays hours, minutes, and seconds.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int MEDIUM = 1 << 16;
-
-    /**
-     * Style constant for long date/time format (value is 1&lt;&lt;28).
-     * <p>
-     * A long date displays the day, month and year.
-     * A long time displays hours, minutes, and seconds.
-     * The day and month names may be displayed.
-     * <br>Note that this is a <em>HINT</em>.
-     * </p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>DateTime</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int LONG = 1 << 28;
-
-    /**
-     * Style constant specifying that a Browser should use a Mozilla GRE
-     * for rendering its content (value is 1&lt;&lt;15).
-     * <p>
-     * <p><b>Used By:</b><ul>
-     * <li><code>Browser</code></li>
-     * </ul></p>
-     *
-     * @since 3.3
-     */
-    public static const int MOZILLA = 1 << 15;
-
-    /**
-     * Style constant for balloon behavior (value is 1&lt;&lt;12).
-     * <p><b>Used By:</b><ul>
-     * <li><code>ToolTip</code></li>
-     * </ul></p>
-     *
-     * @since 3.2
-     */
-    public static const int BALLOON = 1 << 12;
-
-    /**
-     * Style constant for vertical alignment or orientation behavior (value is 1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>GridLayout</code> type</li>
-     * </ul></p>
-     */
-    public static const int BEGINNING = 1;
-
-    /**
-     * Style constant for vertical alignment or orientation behavior (value is 4).
-     * <p><b>Used By:</b><ul>
-     * <li><code>GridLayout</code> type</li>
-     * </ul></p>
-     */
-    public static const int FILL = 4;
-
-    /**
-     * Input Method Editor style constant for double byte
-     * input behavior (value is 1&lt;&lt;1).
-     */
-    public static const int DBCS = 1 << 1;
-
-    /**
-     * Input Method Editor style constant for alpha
-     * input behavior (value is 1&lt;&lt;2).
-     */
-    public static const int ALPHA = 1 << 2;
-
-    /**
-     * Input Method Editor style constant for native
-     * input behavior (value is 1&lt;&lt;3).
-     */
-    public static const int NATIVE = 1 << 3;
-
-    /**
-     * Input Method Editor style constant for phonetic
-     * input behavior (value is 1&lt;&lt;4).
-     */
-    public static const int PHONETIC = 1 << 4;
-
-    /**
-     * Input Method Editor style constant for romanicized
-     * input behavior (value is 1&lt;&lt;5).
-     */
-    public static const int ROMAN = 1 << 5;
-
-    /**
-     * ASCII character convenience constant for the backspace character
-     * (value is the <code>char</code> '\b').
-     */
-    public static const char BS = '\b';
-
-    /**
-     * ASCII character convenience constant for the carriage return character
-     * (value is the <code>char</code> '\r').
-     */
-    public static const char CR = '\r';
-
-    /**
-     * ASCII character convenience constant for the delete character
-     * (value is the <code>char</code> with value 127).
-     */
-    public static const char DEL = 0x7F;
-
-    /**
-     * ASCII character convenience constant for the escape character
-     * (value is the <code>char</code> with value 27).
-     */
-    public static const char ESC = 0x1B;
-
-    /**
-     * ASCII character convenience constant for the line feed character
-     * (value is the <code>char</code> '\n').
-     */
-    public static const char LF = '\n';
-
-    /**
-     * ASCII character convenience constant for the tab character
-     * (value is the <code>char</code> '\t').
-     *
-     * @since 2.1
-     */
-    public static const char TAB = '\t';
-
-    /**
-     * keyboard and/or mouse event mask indicating that the ALT key
-     * was pushed on the keyboard when the event was generated
-     * (value is 1&lt;&lt;16).
-     */
-    public static const int ALT = 1 << 16;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the SHIFT key
-     * was pushed on the keyboard when the event was generated
-     * (value is 1&lt;&lt;17).
-     */
-    public static const int SHIFT = 1 << 17;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the CTRL key
-     * was pushed on the keyboard when the event was generated
-     * (value is 1&lt;&lt;18).
-     */
-    public static const int CTRL = 1 << 18;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the CTRL key
-     * was pushed on the keyboard when the event was generated. This
-     * is a synonym for CTRL (value is 1&lt;&lt;18).
-     */
-    public static const int CONTROL = CTRL;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the COMMAND key
-     * was pushed on the keyboard when the event was generated
-     * (value is 1&lt;&lt;22).
-     *
-     * @since 2.1
-     */
-    public static const int COMMAND = 1 << 22;
-
-    /**
-     * Keyboard and/or mouse event mask indicating all possible
-     * keyboard modifiers.
-     *
-     * To allow for the future, this mask  is intended to be used in
-     * place of code that references  each individual keyboard mask.
-     *  For example, the following expression will determine whether
-     * any modifier is pressed and will continue to work as new modifier
-     * masks are added.
-     *
-     * <code>(stateMask & SWT.MODIFIER_MASK) != 0</code>.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int MODIFIER_MASK;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that mouse button one
-     * was pushed when the event was generated. (value is 1&lt;&lt;19).
-     */
-    public static const int BUTTON1 = 1 << 19;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that mouse button two
-     * was pushed when the event was generated. (value is 1&lt;&lt;20).
-     */
-    public static const int BUTTON2 = 1 << 20;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that mouse button three
-     * was pushed when the event was generated. (value is 1&lt;&lt;21).
-     */
-    public static const int BUTTON3 = 1 << 21;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that mouse button four
-     * was pushed when the event was generated. (value is 1&lt;&lt;23).
-     *
-     * @since 3.1
-     */
-    public static const int BUTTON4 = 1 << 23;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that mouse button five
-     * was pushed when the event was generated. (value is 1&lt;&lt;25).
-     *
-     * @since 3.1
-     */
-    public static const int BUTTON5 = 1 << 25;
-
-    /**
-     * Keyboard and/or mouse event mask indicating all possible
-     * mouse buttons.
-     *
-     * To allow for the future, this mask  is intended to be used
-     * in place of code that references each individual button mask.
-     * For example, the following expression will determine whether
-     * any button is pressed and will continue to work as new button
-     * masks are added.
-     *
-     * <code>(stateMask & SWT.BUTTON_MASK) != 0</code>.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int BUTTON_MASK;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the MOD1 key
-     * was pushed on the keyboard when the event was generated.
-     *
-     * This is the primary keyboard modifier for the platform.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int MOD1;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the MOD2 key
-     * was pushed on the keyboard when the event was generated.
-     *
-     * This is the secondary keyboard modifier for the platform.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int MOD2;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the MOD3 key
-     * was pushed on the keyboard when the event was generated.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int MOD3;
-
-    /**
-     * Keyboard and/or mouse event mask indicating that the MOD4 key
-     * was pushed on the keyboard when the event was generated.
-     *
-     * @since 2.1
-     */
-    public static /*const*/ int MOD4;
-
-    /**
-     * Constants to indicate line scrolling (value is 1).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * </ul></p>
-     *
-     * @since 3.1
-     */
-    public static const int SCROLL_LINE = 1;
-
-    /**
-     * Constants to indicate page scrolling (value is 2).
-     * <p><b>Used By:</b><ul>
-     * <li><code>Control</code></li>
-     * </ul></p>
-     *
-     * @since 3.1
-     */
-    public static const int SCROLL_PAGE = 2;
-
-    /**
-     * Accelerator constant used to differentiate a key code from a
-     * unicode character.
-     *
-     * If this bit is set, then the key stroke
-     * portion of an accelerator represents a key code.  If this bit
-     * is not set, then the key stroke portion of an accelerator is
-     * a unicode character.
-     *
-     * The following expression is false:
-     *
-     * <code>((SWT.MOD1 | SWT.MOD2 | 'T') & SWT.KEYCODE_BIT) != 0</code>.
-     *
-     * The following expression is true:
-     *
-     * <code>((SWT.MOD3 | SWT.F2) & SWT.KEYCODE_BIT) != 0</code>.
-     *
-     * (value is (1&lt;&lt;24))
-     *
-     * @since 2.1
-     */
-    public static const int KEYCODE_BIT = (1 << 24);
-
-    /**
-     * Accelerator constant used to extract the key stroke portion of
-     * an accelerator.
-     *
-     * The key stroke may be a key code or a unicode
-     * value.  If the key stroke is a key code <code>KEYCODE_BIT</code>
-     * will be set.
-     *
-     * @since 2.1
-     */
-    public static const int KEY_MASK = KEYCODE_BIT + 0xFFFF;
-
-    /**
-     * Keyboard event constant representing the UP ARROW key
-     * (value is (1&lt;&lt;24)+1).
-     */
-    public static const int ARROW_UP = KEYCODE_BIT + 1;
-
-    /**
-     * Keyboard event constant representing the DOWN ARROW key
-     * (value is (1&lt;&lt;24)+2).
-     */
-    public static const int ARROW_DOWN = KEYCODE_BIT + 2;
-
-    /**
-     * Keyboard event constant representing the LEFT ARROW key
-     * (value is (1&lt;&lt;24)+3).
-     */
-    public static const int ARROW_LEFT = KEYCODE_BIT + 3;
-
-    /**
-     * Keyboard event constant representing the RIGHT ARROW key
-     * (value is (1&lt;&lt;24)+4).
-     */
-    public static const int ARROW_RIGHT = KEYCODE_BIT + 4;
-
-    /**
-     * Keyboard event constant representing the PAGE UP key
-     * (value is (1&lt;&lt;24)+5).
-     */
-    public static const int PAGE_UP = KEYCODE_BIT + 5;
-
-    /**
-     * Keyboard event constant representing the PAGE DOWN key
-     * (value is (1&lt;&lt;24)+6).
-     */
-    public static const int PAGE_DOWN = KEYCODE_BIT + 6;
-
-    /**
-     * Keyboard event constant representing the HOME key
-     * (value is (1&lt;&lt;24)+7).
-     */
-    public static const int HOME = KEYCODE_BIT + 7;
-
-    /**
-     * Keyboard event constant representing the END key
-     * (value is (1&lt;&lt;24)+8).
-     */
-    public static const int END = KEYCODE_BIT + 8;
-
-    /**
-     * Keyboard event constant representing the INSERT key
-     * (value is (1&lt;&lt;24)+9).
-     */
-    public static const int INSERT = KEYCODE_BIT + 9;
-
-    /**
-     * Keyboard event constant representing the F1 key
-     * (value is (1&lt;&lt;24)+10).
-     */
-    public static const int F1 = KEYCODE_BIT + 10;
-
-    /**
-     * Keyboard event constant representing the F2 key
-     * (value is (1&lt;&lt;24)+11).
-     */
-    public static const int F2 = KEYCODE_BIT + 11;
-
-    /**
-     * Keyboard event constant representing the F3 key
-     * (value is (1&lt;&lt;24)+12).
-     */
-    public static const int F3 = KEYCODE_BIT + 12;
-
-    /**
-     * Keyboard event constant representing the F4 key
-     * (value is (1&lt;&lt;24)+13).
-     */
-    public static const int F4 = KEYCODE_BIT + 13;
-
-    /**
-     * Keyboard event constant representing the F5 key
-     * (value is (1&lt;&lt;24)+14).
-     */
-    public static const int F5 = KEYCODE_BIT + 14;
-
-    /**
-     * Keyboard event constant representing the F6 key
-     * (value is (1&lt;&lt;24)+15).
-     */
-    public static const int F6 = KEYCODE_BIT + 15;
-
-    /**
-     * Keyboard event constant representing the F7 key
-     * (value is (1&lt;&lt;24)+16).
-     */
-    public static const int F7 = KEYCODE_BIT + 16;
-
-    /**
-     * Keyboard event constant representing the F8 key
-     * (value is (1&lt;&lt;24)+17).
-     */
-    public static const int F8 = KEYCODE_BIT + 17;
-
-    /**
-     * Keyboard event constant representing the F9 key
-     * (value is (1&lt;&lt;24)+18).
-     */
-    public static const int F9 = KEYCODE_BIT + 18;
-
-    /**
-     * Keyboard event constant representing the F10 key
-     * (value is (1&lt;&lt;24)+19).
-     */
-    public static const int F10 = KEYCODE_BIT + 19;
-
-    /**
-     * Keyboard event constant representing the F11 key
-     * (value is (1&lt;&lt;24)+20).
-     */
-    public static const int F11 = KEYCODE_BIT + 20;
-
-    /**
-     * Keyboard event constant representing the F12 key
-     * (value is (1&lt;&lt;24)+21).
-     */
-    public static const int F12 = KEYCODE_BIT + 21;
-
-    /**
-     * Keyboard event constant representing the F13 key
-     * (value is (1&lt;&lt;24)+22).
-     *
-     * @since 3.0
-     */
-    public static const int F13 = KEYCODE_BIT + 22;
-
-    /**
-     * Keyboard event constant representing the F14 key
-     * (value is (1&lt;&lt;24)+23).
-     *
-     * @since 3.0
-     */
-    public static const int F14 = KEYCODE_BIT + 23;
-
-    /**
-     * Keyboard event constant representing the F15 key
-     * (value is (1&lt;&lt;24)+24).
-     *
-     * @since 3.0
-     */
-    public static const int F15 = KEYCODE_BIT + 24;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad multiply key (value is (1&lt;&lt;24)+42).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_MULTIPLY = KEYCODE_BIT + 42;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad add key (value is (1&lt;&lt;24)+43).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_ADD = KEYCODE_BIT + 43;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad subtract key (value is (1&lt;&lt;24)+45).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_SUBTRACT = KEYCODE_BIT + 45;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad decimal key (value is (1&lt;&lt;24)+46).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_DECIMAL = KEYCODE_BIT + 46;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad divide key (value is (1&lt;&lt;24)+47).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_DIVIDE = KEYCODE_BIT + 47;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad zero key (value is (1&lt;&lt;24)+48).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_0 = KEYCODE_BIT + 48;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad one key (value is (1&lt;&lt;24)+49).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_1 = KEYCODE_BIT + 49;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad two key (value is (1&lt;&lt;24)+50).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_2 = KEYCODE_BIT + 50;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad three key (value is (1&lt;&lt;24)+51).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_3 = KEYCODE_BIT + 51;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad four key (value is (1&lt;&lt;24)+52).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_4 = KEYCODE_BIT + 52;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad five key (value is (1&lt;&lt;24)+53).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_5 = KEYCODE_BIT + 53;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad six key (value is (1&lt;&lt;24)+54).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_6 = KEYCODE_BIT + 54;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad seven key (value is (1&lt;&lt;24)+55).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_7 = KEYCODE_BIT + 55;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad eight key (value is (1&lt;&lt;24)+56).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_8 = KEYCODE_BIT + 56;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad nine key (value is (1&lt;&lt;24)+57).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_9 = KEYCODE_BIT + 57;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad equal key (value is (1&lt;&lt;24)+61).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_EQUAL = KEYCODE_BIT + 61;
-
-    /**
-     * Keyboard event constant representing the numeric key
-     * pad enter key (value is (1&lt;&lt;24)+80).
-     *
-     * @since 3.0
-     */
-    public static const int KEYPAD_CR = KEYCODE_BIT + 80;
-
-    /**
-     * Keyboard event constant representing the help
-     * key (value is (1&lt;&lt;24)+81).
-     *
-     * NOTE: The HELP key maps to the key labeled "help",
-     * not "F1". If your keyboard does not have a HELP key,
-     * you will never see this key press.  To listen for
-     * help on a control, use SWT.Help.
-     *
-     * @since 3.0
-     *
-     * @see SWT#Help
-     */
-    public static const int HELP = KEYCODE_BIT + 81;
-
-    /**
-     * Keyboard event constant representing the caps
-     * lock key (value is (1&lt;&lt;24)+82).
-     *
-     * @since 3.0
-     */
-    public static const int CAPS_LOCK = KEYCODE_BIT + 82;
-
-    /**
-     * Keyboard event constant representing the num
-     * lock key (value is (1&lt;&lt;24)+83).
-     *
-     * @since 3.0
-     */
-    public static const int NUM_LOCK = KEYCODE_BIT + 83;
-
-    /**
-     * Keyboard event constant representing the scroll
-     * lock key (value is (1&lt;&lt;24)+84).
-     *
-     * @since 3.0
-     */
-    public static const int SCROLL_LOCK = KEYCODE_BIT + 84;
-
-    /**
-     * Keyboard event constant representing the pause
-     * key (value is (1&lt;&lt;24)+85).
-     *
-     * @since 3.0
-     */
-    public static const int PAUSE = KEYCODE_BIT + 85;
-
-    /**
-     * Keyboard event constant representing the break
-     * key (value is (1&lt;&lt;24)+86).
-     *
-     * @since 3.0
-     */
-    public static const int BREAK = KEYCODE_BIT + 86;
-
-    /**
-     * Keyboard event constant representing the print screen
-     * key (value is (1&lt;&lt;24)+87).
-     *
-     * @since 3.0
-     */
-    public static const int PRINT_SCREEN = KEYCODE_BIT + 87;
-
-    /**
-     * The <code>MessageBox</code> style constant for error icon
-     * behavior (value is 1).
-     */
-    public static const int ICON_ERROR = 1;
-
-    /**
-     * The <code>MessageBox</code> style constant for information icon
-     * behavior (value is 1&lt;&lt;1).
-     */
-    public static const int ICON_INFORMATION = 1 << 1;
-
-    /**
-     * The <code>MessageBox</code> style constant for question icon
-     * behavior (value is 1&lt;&lt;2).
-     */
-    public static const int ICON_QUESTION = 1 << 2;
-
-    /**
-     * The <code>MessageBox</code> style constant for warning icon
-     * behavior (value is 1&lt;&lt;3).
-     */
-    public static const int ICON_WARNING = 1 << 3;
-
-    /**
-     * The <code>MessageBox</code> style constant for "working" icon
-     * behavior (value is 1&lt;&lt;4).
-     */
-    public static const int ICON_WORKING = 1 << 4;
-
-    /**
-     * The <code>MessageBox</code> style constant for an OK button;
-     * valid combinations are OK, OK|CANCEL
-     * (value is 1&lt;&lt;5).
-     */
-    public static const int OK = 1 << 5;
-
-    /**
-     * The <code>MessageBox</code> style constant for YES button;
-     * valid combinations are YES|NO, YES|NO|CANCEL
-     * (value is 1&lt;&lt;6).
-     */
-    public static const int YES = 1 << 6;
-
-    /**
-     * The <code>MessageBox</code> style constant for NO button;
-     * valid combinations are YES|NO, YES|NO|CANCEL
-     * (value is 1&lt;&lt;7).
-     */
-    public static const int NO = 1 << 7;
-
-    /**
-     * The <code>MessageBox</code> style constant for a CANCEL button;
-     * valid combinations are OK|CANCEL, YES|NO|CANCEL, RETRY|CANCEL
-     * (value is 1&lt;&lt;8).  This style constant is also used with
-     * <code>Text</code> in combination with SEARCH.
-     *
-     * <p><b>Used By:</b><ul>
-     * <li><code>MessageBox</code></li>
-     * <li><code>Text</code></li>
-     * </ul></p>
-     */
-    public static const int CANCEL = 1 << 8;
-
-    /**
-     * The <code>MessageBox</code> style constant for an ABORT button;
-     * the only valid combination is ABORT|RETRY|IGNORE
-     * (value is 1&lt;&lt;9).
-     */
-    public static const int ABORT = 1 << 9;
-
-    /**
-     * The <code>MessageBox</code> style constant for a RETRY button;
-     *  valid combinations are ABORT|RETRY|IGNORE, RETRY|CANCEL
-     * (value is 1&lt;&lt;10).
-     */
-    public static const int RETRY = 1 << 10;
-
-    /**
-     * The <code>MessageBox</code> style constant for an IGNORE button;
-     * the only valid combination is ABORT|RETRY|IGNORE
-     * (value is 1&lt;&lt;11).
-     */
-    public static const int IGNORE = 1 << 11;
-
-    /**
-     * The <code>FileDialog</code> style constant for open file dialog behavior
-     * (value is 1&lt;&lt;12).
-     */
-    public static const int OPEN = 1 << 12;
-
-    /**
-     * The <code>FileDialog</code> style constant for save file dialog behavior
-     * (value is 1&lt;&lt;13).
-     */
-    public static const int SAVE = 1 << 13;
-
-    /**
-     * The <code>Composite</code> constant to indicate that
-     * an attribute (such as background) is not inherited
-     * by the children (value is 0).
-     *
-     * @since 3.2
-     */
-    public static const int INHERIT_NONE = 0;
-
-    /**
-     * The <code>Composite</code> constant to indicate that
-     * an attribute (such as background) is inherited by
-     * children who choose this value as their "default"
-     * (value is 1).  For example, a label child will
-     * typically choose to inherit the background color
-     * of a composite while a list or table will not.
-     *
-     * @since 3.2
-     */
-    public static const int INHERIT_DEFAULT = 1;
-
-    /**
-     * The <code>Composite</code> constant to indicate that
-     * an attribute (such as background) is inherited by
-     * all children.
-     *
-     * @since 3.2
-     */
-    public static const int INHERIT_FORCE = 2;
-
-    /**
-     * Default color white (value is 1).
-     */
-    public static const int COLOR_WHITE = 1;
-
-    /**
-     * Default color black (value is 2).
-     */
-    public static const int COLOR_BLACK = 2;
-
-    /**
-     * Default color red (value is 3).
-     */
-    public static const int COLOR_RED = 3;
-
-    /**
-     * Default color dark red (value is 4).
-     */
-    public static const int COLOR_DARK_RED = 4;
-
-    /**
-     * Default color green (value is 5).
-     */
-    public static const int COLOR_GREEN = 5;
-
-    /**
-     * Default color dark green (value is 6).
-     */
-    public static const int COLOR_DARK_GREEN = 6;
-
-    /**
-     * Default color yellow (value is 7).
-     */
-    public static const int COLOR_YELLOW = 7;
-
-    /**
-     * Default color dark yellow (value is 8).
-     */
-    public static const int COLOR_DARK_YELLOW = 8;
-
-    /**
-     * Default color blue (value is 9).
-     */
-    public static const int COLOR_BLUE = 9;
-
-    /**
-     * Default color dark blue (value is 10).
-     */
-    public static const int COLOR_DARK_BLUE = 10;
-
-    /**
-     * Default color magenta (value is 11).
-     */
-    public static const int COLOR_MAGENTA = 11;
-
-    /**
-     * Default color dark magenta (value is 12).
-     */
-    public static const int COLOR_DARK_MAGENTA = 12;
-
-    /**
-     * Default color cyan (value is 13).
-     */
-    public static const int COLOR_CYAN = 13;
-
-    /**
-     * Default color dark cyan (value is 14).
-     */
-    public static const int COLOR_DARK_CYAN = 14;
-
-    /**
-     * Default color gray (value is 15).
-     */
-    public static const int COLOR_GRAY = 15;
-
-    /**
-     * Default color dark gray (value is 16).
-     */
-    public static const int COLOR_DARK_GRAY = 16;
-
-    /*
-     * System Colors
-     *
-     * Dealing with system colors is an area where there are
-     * many platform differences.  On some platforms, system
-     * colors can change dynamically while the program is
-     * running.  On other platforms, system colors can be
-     * changed for all instances of a particular widget.
-     * Therefore, the only truly portable method to obtain
-     * a widget color query is to query the color from an
-     * instance of the widget.
-     *
-     *  It is expected that the list of supported colors
-     * will grow over time.
-     */
-
-    /**
-     * System color used to paint dark shadow areas (value is 17).
-     */
-    public static const int COLOR_WIDGET_DARK_SHADOW = 17;
-
-    /**
-     * System color used to paint normal shadow areas (value is 18).
-     */
-    public static const int COLOR_WIDGET_NORMAL_SHADOW = 18;
-
-    /**
-     * System color used to paint light shadow areas (value is 19).
-     */
-    public static const int COLOR_WIDGET_LIGHT_SHADOW = 19;
-
-    /**
-     * System color used to paint highlight shadow areas (value is 20).
-     */
-    public static const int COLOR_WIDGET_HIGHLIGHT_SHADOW = 20;
-
-    /**
-     * System color used to paint foreground areas (value is 21).
-     */
-    public static const int COLOR_WIDGET_FOREGROUND = 21;
-
-    /**
-     * System color used to paint background areas (value is 22).
-     */
-    public static const int COLOR_WIDGET_BACKGROUND = 22;
-
-    /**
-     * System color used to paint border areas (value is 23).
-     */
-    public static const int COLOR_WIDGET_BORDER = 23;
-
-    /**
-     * System color used to paint list foreground areas (value is 24).
-     */
-    public static const int COLOR_LIST_FOREGROUND = 24;
-
-    /**
-     * System color used to paint list background areas (value is 25).
-     */
-    public static const int COLOR_LIST_BACKGROUND = 25;
-
-    /**
-     * System color used to paint list selection background areas (value is 26).
-     */
-    public static const int COLOR_LIST_SELECTION = 26;
-
-    /**
-     * System color used to paint list selected text (value is 27).
-     */
-    public static const int COLOR_LIST_SELECTION_TEXT = 27;
-
-    /**
-     * System color used to paint tooltip text (value is 28).
-     */
-    public static const int COLOR_INFO_FOREGROUND = 28;
-
-    /**
-     * System color used to paint tooltip background areas (value is 29).
-     */
-    public static const int COLOR_INFO_BACKGROUND = 29;
-
-    /**
-     * System color used to paint title text (value is 30).
-     */
-    public static const int COLOR_TITLE_FOREGROUND = 30;
-
-    /**
-     * System color used to paint title background areas (value is 31).
-     */
-    public static const int COLOR_TITLE_BACKGROUND = 31;
-
-    /**
-     * System color used to paint title background gradient (value is 32).
-     */
-    public static const int COLOR_TITLE_BACKGROUND_GRADIENT = 32;
-
-    /**
-     * System color used to paint inactive title text (value is 33).
-     */
-    public static const int COLOR_TITLE_INACTIVE_FOREGROUND = 33;
-
-    /**
-     * System color used to paint inactive title background areas (value is 34).
-     */
-    public static const int COLOR_TITLE_INACTIVE_BACKGROUND = 34;
-
-    /**
-     * System color used to paint inactive title background gradient (value is 35).
-     */
-    public static const int COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = 35;
-
-    /**
-     * Draw constant indicating whether the drawing operation
-     * should fill the background (value is 1&lt;&lt;0).
-     */
-    public static const int DRAW_TRANSPARENT = 1 << 0;
-
-    /**
-     * Draw constant indicating whether the string drawing operation
-     * should handle line-delimiters (value is 1&lt;&lt;1).
-     */
-    public static const int DRAW_DELIMITER = 1 << 1;
-
-    /**
-     * Draw constant indicating whether the string drawing operation
-     * should expand TAB characters (value is 1&lt;&lt;2).
-     */
-    public static const int DRAW_TAB = 1 << 2;
-
-    /**
-     * Draw constant indicating whether the string drawing operation
-     * should handle mnemonics (value is 1&lt;&lt;3).
-     */
-    public static const int DRAW_MNEMONIC = 1 << 3;
-
-
-    /**
-     * Selection constant indicating that a line delimiter should be
-     * drawn (value is 1&lt;&lt;17).
-     *
-     * <p><b>Used By:</b><ul>
-     * <li><code>TextLayout</code></li>
-     * </ul></p>
-     *
-     * @see #FULL_SELECTION
-     * @see #LAST_LINE_SELECTION
-     *
-     * @since 3.3
-     */
-    public static const int DELIMITER_SELECTION = 1 << 17;
-
-    /**
-     * Selection constant indicating that the last line is selected
-     * to the end and should be drawn using either a line delimiter
-     * or full line selection (value is 1&lt;&lt;20).
-     *
-     * <p><b>Used By:</b><ul>
-     * <li><code>TextLayout</code></li>
-     * </ul></p>
-     *
-     * @see #DELIMITER_SELECTION
-     * @see #FULL_SELECTION
-     *
-     * @since 3.3
-     */
-    public static const int LAST_LINE_SELECTION = 1 << 20;
-
-    /**
-     * SWT error constant indicating that no error number was specified
-     * (value is 1).
-     */
-    public static const int ERROR_UNSPECIFIED = 1;
-
-    /**
-     * SWT error constant indicating that no more handles for an
-     * operating system resource are available
-     * (value is 2).
-     */
-    public static const int ERROR_NO_HANDLES = 2;
-
-    /**
-     * SWT error constant indicating that no more callback resources are available
-     * (value is 3).
-     */
-    public static const int ERROR_NO_MORE_CALLBACKS = 3;
-
-    /**
-     * SWT error constant indicating that a null argument was passed in
-     * (value is 4).
-     */
-    public static const int ERROR_NULL_ARGUMENT = 4;
-
-    /**
-     * SWT error constant indicating that an invalid argument was passed in
-     * (value is 5).
-     */
-    public static const int ERROR_INVALID_ARGUMENT = 5;
-
-    /**
-     * SWT error constant indicating that a value was found to be
-     * outside the allowable range
-     * (value is 6).
-     */
-    public static const int ERROR_INVALID_RANGE = 6;
-
-    /**
-     * SWT error constant indicating that a value which can not be
-     * zero was found to be
-     * (value is 7).
-     */
-    public static const int ERROR_CANNOT_BE_ZERO = 7;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide the value of an item
-     * (value is 8).
-     */
-    public static const int ERROR_CANNOT_GET_ITEM = 8;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide the selection
-     * (value is 9).
-     */
-    public static const int ERROR_CANNOT_GET_SELECTION = 9;
-
-    /**
-     * SWT error constant indicating that the matrix is not invertible
-     * (value is 10).
-     *
-     * @since 3.1
-     */
-    public static const int ERROR_CANNOT_INVERT_MATRIX = 10;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide the height of an item
-     * (value is 11).
-     */
-    public static const int ERROR_CANNOT_GET_ITEM_HEIGHT = 11;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide the text of a widget
-     * (value is 12).
-     */
-    public static const int ERROR_CANNOT_GET_TEXT = 12;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to set the text of a widget
-     * (value is 13).
-     */
-    public static const int ERROR_CANNOT_SET_TEXT = 13;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to add an item
-     * (value is 14).
-     */
-    public static const int ERROR_ITEM_NOT_ADDED = 14;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to remove an item
-     * (value is 15).
-     */
-    public static const int ERROR_ITEM_NOT_REMOVED = 15;
-
-    /**
-     * SWT error constant indicating that the graphics library
-     * is not available
-     * (value is 16).
-     */
-    public static const int ERROR_NO_GRAPHICS_LIBRARY = 16;
-
-    /**
-     * SWT error constant indicating that a particular feature has
-     * not been implemented on this platform
-     * (value is 20).
-     */
-    public static const int ERROR_NOT_IMPLEMENTED = 20;
-
-    /**
-     * SWT error constant indicating that a menu which needed
-     * to have the drop down style had some other style instead
-     * (value is 21).
-     */
-    public static const int ERROR_MENU_NOT_DROP_DOWN = 21;
-
-    /**
-     * SWT error constant indicating that an attempt was made to
-     * invoke an SWT operation which can only be executed by the
-     * user-interface thread from some other thread
-     * (value is 22).
-     */
-    public static const int ERROR_THREAD_INVALID_ACCESS = 22;
-
-    /**
-     * SWT error constant indicating that an attempt was made to
-     * invoke an SWT operation using a widget which had already
-     * been disposed
-     * (value is 24).
-     */
-    public static const int ERROR_WIDGET_DISPOSED = 24;
-
-    /**
-     * SWT error constant indicating that a menu item which needed
-     * to have the cascade style had some other style instead
-     * (value is 27).
-     */
-    public static const int ERROR_MENUITEM_NOT_CASCADE = 27;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to set the selection of a widget
-     * (value is 28).
-     */
-    public static const int ERROR_CANNOT_SET_SELECTION = 28;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to set the menu
-     * (value is 29).
-     */
-    public static const int ERROR_CANNOT_SET_MENU = 29;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to set the enabled state
-     * (value is 30).
-     */
-    public static const int ERROR_CANNOT_SET_ENABLED = 30;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide enabled/disabled state information
-     * (value is 31).
-     */
-    public static const int ERROR_CANNOT_GET_ENABLED = 31;
-
-    /**
-     * SWT error constant indicating that a provided widget can
-     * not be used as a parent in the current operation
-     * (value is 32).
-     */
-    public static const int ERROR_INVALID_PARENT = 32;
-
-    /**
-     * SWT error constant indicating that a menu which needed
-     * to have the menu bar style had some other style instead
-     * (value is 33).
-     */
-    public static const int ERROR_MENU_NOT_BAR = 33;
-
-    /**
-     * SWT error constant indicating that the underlying operating
-     * system was unable to provide count information
-     * (value is 36).
-     */
-    public static const int ERROR_CANNOT_GET_COUNT = 36;
-
-    /**
-     * SWT error constant indicating that a menu which needed
-     * to have the pop up menu style had some other style instead
-     * (value is 37).
-     */
-    public static const int ERROR_MENU_NOT_POP_UP = 37;
-
-    /**
-     * SWT error constant indicating that a graphics operation
-     * was attempted with an image of an unsupported depth
-     * (value is 38).
-     */
-    public static const int ERROR_UNSUPPORTED_DEPTH = 38;
-
-    /**
-     * SWT error constant indicating that an input/output operation
-     * failed during the execution of an SWT operation
-     * (value is 39).
-     */
-    public static const int ERROR_IO = 39;
-
-    /**
-     * SWT error constant indicating that a graphics operation
-     * was attempted with an image having an invalid format
-     * (value is 40).
-     */
-    public static const int ERROR_INVALID_IMAGE = 40;
-
-    /**
-     * SWT error constant indicating that a graphics operation
-     * was attempted with an image having a valid but unsupported
-     * format
-     * (value is 42).
-     */
-    public static const int ERROR_UNSUPPORTED_FORMAT = 42;
-
-    /**
-     * SWT error constant indicating that an attempt was made
-     * to subclass an SWT widget class without implementing the
-     * <code>checkSubclass()</code> method
-     * (value is 43).
-     *
-     * For additional information see the comment in
-     * <code>Widget.checkSubclass()</code>.
-     *
-     * @see dwt.widgets.Widget#checkSubclass
-     */
-    public static const int ERROR_INVALID_SUBCLASS = 43;
-
-    /**
-     * SWT error constant indicating that an attempt was made to
-     * invoke an SWT operation using a graphics object which had
-     * already been disposed
-     * (value is 44).
-     */
-    public static const int ERROR_GRAPHIC_DISPOSED = 44;
-
-    /**
-     * SWT error constant indicating that an attempt was made to
-     * invoke an SWT operation using a device which had already
-     * been disposed
-     * (value is 45).
-     */
-    public static const int ERROR_DEVICE_DISPOSED = 45;
-
-    /**
-     * SWT error constant indicating that an exception happened
-     * when executing a runnable
-     * (value is 46).
-     */
-    public static const int ERROR_FAILED_EXEC = 46;
-
-    /**
-     * SWT error constant indicating that an unsatisfied link
-     * error occurred while attempting to load a library
-     * (value is 47).
-     *
-     * @since 3.1
-     */
-    public static const int ERROR_FAILED_LOAD_LIBRARY = 47;
-
-    /**
-     * SWT error constant indicating that a font is not valid
-     * (value is 48).
-     *
-     * @since 3.1
-     */
-    public static const int ERROR_INVALID_FONT = 48;
-
-    /**
-     * Constant indicating that an image or operation is of type bitmap  (value is 0).
-     */
-    public static const int BITMAP = 0;
-
-    /**
-     * Constant indicating that an image or operation is of type icon  (value is 1).
-     */
-    public static const int ICON = 1;
-
-    /**
-     * The <code>Image</code> constructor argument indicating that
-     * the new image should be a copy of the image provided as
-     * an argument  (value is 0).
-     */
-    public static const int IMAGE_COPY = 0;
-
-    /**
-     * The <code>Image</code> constructor argument indicating that
-     * the new image should have the appearance of a "disabled"
-     * (using the platform's rules for how this should look)
-     * copy of the image provided as an argument  (value is 1).
-     */
-    public static const int IMAGE_DISABLE = 1;
-
-    /**
-     * The <code>Image</code> constructor argument indicating that
-     * the new image should have the appearance of a "gray scaled"
-     * copy of the image provided as an argument  (value is 2).
-     */
-    public static const int IMAGE_GRAY = 2;
-
-    /**
-     * The font style constant indicating a normal weight, non-italic font
-     * (value is 0).
-     */
-    public static const int NORMAL = 0;
-
-    /**
-     * The font style constant indicating a bold weight font
-     * (value is 1&lt;&lt;0).
-     */
-    public static const int BOLD = 1 << 0;
-
-    /**
-     * The font style constant indicating an italic font
-     * (value is 1&lt;&lt;1).
-     */
-    public static const int ITALIC = 1 << 1;
-
-    /**
-     * System arrow cursor  (value is 0).
-     */
-    public static const int CURSOR_ARROW = 0;
-
-    /**
-     * System wait cursor  (value is 1).
-     */
-    public static const int CURSOR_WAIT = 1;
-
-    /**
-     * System cross hair cursor  (value is 2).
-     */
-    public static const int CURSOR_CROSS = 2;
-
-    /**
-     * System app startup cursor  (value is 3).
-     */
-    public static const int CURSOR_APPSTARTING = 3;
-
-    /**
-     * System help cursor  (value is 4).
-     */
-    public static const int CURSOR_HELP = 4;
-
-    /**
-     * System resize all directions cursor (value is 5).
-     */
-    public static const int CURSOR_SIZEALL = 5;
-
-    /**
-     * System resize north-east-south-west cursor  (value is 6).
-     */
-    public static const int CURSOR_SIZENESW = 6;
-
-    /**
-     * System resize north-south cursor  (value is 7).
-     */
-    public static const int CURSOR_SIZENS = 7;
-
-    /**
-     * System resize north-west-south-east cursor  (value is 8).
-     */
-    public static const int CURSOR_SIZENWSE = 8;
-
-    /**
-     * System resize west-east cursor  (value is 9).
-     */
-    public static const int CURSOR_SIZEWE = 9;
-
-    /**
-     * System resize north cursor  (value is 10).
-     */
-    public static const int CURSOR_SIZEN = 10;
-
-    /**
-     * System resize south cursor  (value is 11).
-     */
-    public static const int CURSOR_SIZES = 11;
-
-    /**
-     * System resize east cursor  (value is 12).
-     */
-    public static const int CURSOR_SIZEE = 12;
-
-    /**
-     * System resize west cursor  (value is 13).
-     */
-    public static const int CURSOR_SIZEW = 13;
-
-    /**
-     * System resize north-east cursor (value is 14).
-     */
-    public static const int CURSOR_SIZENE = 14;
-
-    /**
-     * System resize south-east cursor (value is 15).
-     */
-    public static const int CURSOR_SIZESE = 15;
-
-    /**
-     * System resize south-west cursor (value is 16).
-     */
-    public static const int CURSOR_SIZESW = 16;
-
-    /**
-     * System resize north-west cursor (value is 17).
-     */
-    public static const int CURSOR_SIZENW = 17;
-
-    /**
-     * System up arrow cursor  (value is 18).
-     */
-    public static const int CURSOR_UPARROW = 18;
-
-    /**
-     * System i-beam cursor (value is 19).
-     */
-    public static const int CURSOR_IBEAM = 19;
-
-    /**
-     * System "not allowed" cursor (value is 20).
-     */
-    public static const int CURSOR_NO = 20;
-
-    /**
-     * System hand cursor (value is 21).
-     */
-    public static const int CURSOR_HAND = 21;
-
-    /**
-     * Line drawing style for flat end caps (value is 1).
-     *
-     * @see dwt.graphics.GC#setLineCap(int)
-     * @see dwt.graphics.GC#getLineCap()
-     *
-     * @since 3.1
-     */
-    public static const int CAP_FLAT = 1;
-
-    /**
-     * Line drawing style for rounded end caps (value is 2).
-     *
-     * @see dwt.graphics.GC#setLineCap(int)
-     * @see dwt.graphics.GC#getLineCap()
-     *
-     * @since 3.1
-     */
-    public static const int CAP_ROUND = 2;
-
-    /**
-     * Line drawing style for square end caps (value is 3).
-     *
-     * @see dwt.graphics.GC#setLineCap(int)
-     * @see dwt.graphics.GC#getLineCap()
-     *
-     * @since 3.1
-     */
-    public static const int CAP_SQUARE = 3;
-
-    /**
-     * Line drawing style for miter joins (value is 1).
-     *
-     * @see dwt.graphics.GC#setLineJoin(int)
-     * @see dwt.graphics.GC#getLineJoin()
-     *
-     * @since 3.1
-     */
-    public static const int JOIN_MITER = 1;
-
-    /**
-     * Line drawing  style for rounded joins (value is 2).
-     *
-     * @see dwt.graphics.GC#setLineJoin(int)
-     * @see dwt.graphics.GC#getLineJoin()
-     *
-     * @since 3.1
-     */
-    public static const int JOIN_ROUND = 2;
-
-    /**
-     * Line drawing style for bevel joins (value is 3).
-     *
-     * @see dwt.graphics.GC#setLineJoin(int)
-     * @see dwt.graphics.GC#getLineJoin()
-     *
-     * @since 3.1
-     */
-    public static const int JOIN_BEVEL = 3;
-
-    /**
-     * Line drawing style for solid lines  (value is 1).
-     */
-    public static const int LINE_SOLID = 1;
-
-    /**
-     * Line drawing style for dashed lines (value is 2).
-     */
-    public static const int LINE_DASH = 2;
-
-    /**
-     * Line drawing style for dotted lines (value is 3).
-     */
-    public static const int LINE_DOT = 3;
-
-    /**
-     * Line drawing style for alternating dash-dot lines (value is 4).
-     */
-    public static const int LINE_DASHDOT = 4;
-
-    /**
-     * Line drawing style for dash-dot-dot lines (value is 5).
-     */
-    public static const int LINE_DASHDOTDOT = 5;
-
-    /**
-     * Line drawing style for custom dashed lines (value is 6).
-     *
-     * @see dwt.graphics.GC#setLineDash(int[])
-     * @see dwt.graphics.GC#getLineDash()
-     *
-     * @since 3.1
-     */
-    public static const int LINE_CUSTOM = 6;
-
-    /**
-     * Path constant that represents a "move to" operation (value is 1).
-     *
-     * @since 3.1
-     */
-    public static const int PATH_MOVE_TO = 1;
-
-    /**
-     * Path constant that represents a "line to" operation (value is 2).
-     *
-     * @since 3.1
-     */
-    public static const int PATH_LINE_TO = 2;
-
-    /**
-     * Path constant that represents a "quadratic curve to" operation (value is 3).
-     *
-     * @since 3.1
-     */
-    public static const int PATH_QUAD_TO = 3;
-
-    /**
-     * Path constant that represents a "cubic curve to" operation (value is 4).
-     *
-     * @since 3.1
-     */
-    public static const int PATH_CUBIC_TO = 4;
-
-    /**
-     * Path constant that represents a "close" operation (value is 5).
-     *
-     * @since 3.1
-     */
-    public static const int PATH_CLOSE = 5;
-
-    /**
-     * Even odd rule for filling operations (value is 1).
-     *
-     * @since 3.1
-     */
-    public static const int FILL_EVEN_ODD = 1;
-
-    /**
-     * Winding rule for filling operations (value is 2).
-     *
-     * @since 3.1
-     */
-    public static const int FILL_WINDING = 2;
-
-    /**
-     * Image format constant indicating an unknown image type (value is -1).
-     */
-    public static const int IMAGE_UNDEFINED = -1;
-
-    /**
-     * Image format constant indicating a Windows BMP format image (value is 0).
-     */
-    public static const int IMAGE_BMP = 0;
-
-    /**
-     * Image format constant indicating a run-length encoded
-     * Windows BMP format image (value is 1).
-     */
-    public static const int IMAGE_BMP_RLE = 1;
-
-    /**
-     * Image format constant indicating a GIF format image (value is 2).
-     */
-    public static const int IMAGE_GIF = 2;
-
-    /**
-     * Image format constant indicating a ICO format image (value is 3).
-     */
-    public static const int IMAGE_ICO = 3;
-
-    /**
-     * Image format constant indicating a JPEG format image (value is 4).
-     */
-    public static const int IMAGE_JPEG = 4;
-
-    /**
-     * Image format constant indicating a PNG format image (value is 5).
-     */
-    public static const int IMAGE_PNG = 5;
-
-    /**
-     * Image format constant indicating a TIFF format image (value is 6).
-     */
-    public static const int IMAGE_TIFF = 6;
-
-    /**
-     * Image format constant indicating an OS/2 BMP format image (value is 7).
-     */
-    public static const int IMAGE_OS2_BMP = 7;
-
-    /**
-     * GIF image disposal method constants indicating that the
-     * disposal method is unspecified (value is 0).
-     */
-    public static const int DM_UNSPECIFIED = 0x0;
-
-    /**
-     * GIF image disposal method constants indicating that the
-     * disposal method is to do nothing; that is, to leave the
-     * previous image in place (value is 1).
-     */
-    public static const int DM_FILL_NONE = 0x1;
-
-    /**
-     * GIF image disposal method constants indicating that the
-     * the previous images should be covered with the background
-     * color before displaying the next image (value is 2).
-     */
-    public static const int DM_FILL_BACKGROUND = 0x2;
-
-    /**
-     * GIF image disposal method constants indicating that the
-     * disposal method is to restore the previous picture
-     * (value is 3).
-     */
-    public static const int DM_FILL_PREVIOUS = 0x3;
-
-    /**
-     * Image transparency constant indicating that the image
-     * contains no transparency information (value is 0).
-     */
-    public static const int TRANSPARENCY_NONE = 0x0;
-
-    /**
-     * Image transparency constant indicating that the image
-     * contains alpha transparency information (value is 1&lt;&lt;0).
-     */
-    public static const int TRANSPARENCY_ALPHA = 1 << 0;
-
-    /**
-     * Image transparency constant indicating that the image
-     * contains a transparency mask (value is 1&lt;&lt;1).
-     */
-    public static const int TRANSPARENCY_MASK = 1 << 1;
-
-    /**
-     * Image transparency constant indicating that the image
-     * contains a transparent pixel (value is 1&lt;&lt;2).
-     */
-    public static const int TRANSPARENCY_PIXEL = 1 << 2;
-
-    /**
-     * The character movement type (value is 1&lt;&lt;0).
-     * This constant is used to move a text offset over a character.
-     *
-     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
-     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
-     *
-     * @since 3.0
-     */
-    public static const int MOVEMENT_CHAR = 1 << 0;
-
-    /**
-     * The cluster movement type (value is 1&lt;&lt;1).
-     * This constant is used to move a text offset over a cluster.
-     * A cluster groups one or more characters. A cluster is
-     * undivisible, this means that a caret offset can not be placed in the
-     * middle of a cluster.
-     *
-     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
-     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
-     *
-     * @since 3.0
-     */
-    public static const int MOVEMENT_CLUSTER = 1 << 1;
-
-    /**
-     * The word movement type (value is 1&lt;&lt;2).
-     * This constant is used to move a text offset over a word.
-     * The behavior of this constant depends on the platform and on the
-     * direction of the movement. For example, on Windows the stop is
-     * always at the start of the word. On GTK and Mac the stop is at the end
-     * of the word if the direction is next and at the start of the word if the
-     * direction is previous.
-     *
-     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
-     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
-     *
-     * @since 3.0
-     */
-    public static const int MOVEMENT_WORD = 1 << 2;
-
-    /**
-     * The word end movement type (value is 1&lt;&lt;3).
-     * This constant is used to move a text offset to the next or previous
-     * word end. The behavior of this constant does not depend on the platform.
-     *
-     *
-     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
-     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
-     *
-     * @since 3.3
-     */
-    public static const int MOVEMENT_WORD_END = 1 << 3;
-
-    /**
-     * The word start movement type (value is 1&lt;&lt;4).
-     * This constant is used to move a text offset to the next or previous
-     * word start. The behavior of this constant does not depend on the platform.
-     *
-     * @see dwt.graphics.TextLayout#getNextOffset(int, int)
-     * @see dwt.graphics.TextLayout#getPreviousOffset(int, int)
-     *
-     * @since 3.3
-     */
-    public static const int MOVEMENT_WORD_START = 1 << 4;
-
-
-/**
- * Answers a concise, human readable description of the error code.
- *
- * @param code the SWT error code.
- * @return a description of the error code.
- *
- * @see SWT
- */
-static char[] findErrorText (int code) {
-    switch (code) {
-        case ERROR_UNSPECIFIED:            return "Unspecified error"; //$NON-NLS-1$
-        case ERROR_NO_HANDLES:             return "No more handles"; //$NON-NLS-1$
-        case ERROR_NO_MORE_CALLBACKS:      return "No more callbacks"; //$NON-NLS-1$
-        case ERROR_NULL_ARGUMENT:          return "Argument cannot be null"; //$NON-NLS-1$
-        case ERROR_INVALID_ARGUMENT:       return "Argument not valid"; //$NON-NLS-1$
-        case ERROR_INVALID_RANGE:          return "Index out of bounds"; //$NON-NLS-1$
-        case ERROR_CANNOT_BE_ZERO:         return "Argument cannot be zero"; //$NON-NLS-1$
-        case ERROR_CANNOT_GET_ITEM:        return "Cannot get item"; //$NON-NLS-1$
-        case ERROR_CANNOT_GET_SELECTION:   return "Cannot get selection"; //$NON-NLS-1$
-        case ERROR_CANNOT_GET_ITEM_HEIGHT: return "Cannot get item height"; //$NON-NLS-1$
-        case ERROR_CANNOT_GET_TEXT:        return "Cannot get text"; //$NON-NLS-1$
-        case ERROR_CANNOT_SET_TEXT:        return "Cannot set text"; //$NON-NLS-1$
-        case ERROR_ITEM_NOT_ADDED:         return "Item not added"; //$NON-NLS-1$
-        case ERROR_ITEM_NOT_REMOVED:       return "Item not removed"; //$NON-NLS-1$
-        case ERROR_NOT_IMPLEMENTED:        return "Not implemented"; //$NON-NLS-1$
-        case ERROR_MENU_NOT_DROP_DOWN:     return "Menu must be a drop down"; //$NON-NLS-1$
-        case ERROR_THREAD_INVALID_ACCESS:  return "Invalid thread access"; //$NON-NLS-1$
-        case ERROR_WIDGET_DISPOSED:        return "Widget is disposed"; //$NON-NLS-1$
-        case ERROR_MENUITEM_NOT_CASCADE:   return "Menu item is not a CASCADE"; //$NON-NLS-1$
-        case ERROR_CANNOT_SET_SELECTION:   return "Cannot set selection";  //$NON-NLS-1$
-        case ERROR_CANNOT_SET_MENU:        return "Cannot set menu";  //$NON-NLS-1$
-        case ERROR_CANNOT_SET_ENABLED:     return "Cannot set the enabled state";  //$NON-NLS-1$
-        case ERROR_CANNOT_GET_ENABLED:     return "Cannot get the enabled state";  //$NON-NLS-1$
-        case ERROR_INVALID_PARENT:         return "Widget has the wrong parent";  //$NON-NLS-1$
-        case ERROR_MENU_NOT_BAR:           return "Menu is not a BAR";  //$NON-NLS-1$
-        case ERROR_CANNOT_GET_COUNT:       return "Cannot get count"; //$NON-NLS-1$
-        case ERROR_MENU_NOT_POP_UP:        return "Menu is not a POP_UP"; //$NON-NLS-1$
-        case ERROR_UNSUPPORTED_DEPTH:      return "Unsupported color depth"; //$NON-NLS-1$
-        case ERROR_IO:                     return "i/o error"; //$NON-NLS-1$
-        case ERROR_INVALID_IMAGE:          return "Invalid image"; //$NON-NLS-1$
-        case ERROR_UNSUPPORTED_FORMAT:     return "Unsupported or unrecognized format"; //$NON-NLS-1$
-        case ERROR_INVALID_SUBCLASS:       return "Subclassing not allowed"; //$NON-NLS-1$
-        case ERROR_GRAPHIC_DISPOSED:       return "Graphic is disposed"; //$NON-NLS-1$
-        case ERROR_DEVICE_DISPOSED:        return "Device is disposed"; //$NON-NLS-1$
-        case ERROR_FAILED_EXEC:            return "Failed to execute runnable"; //$NON-NLS-1$
-        case ERROR_FAILED_LOAD_LIBRARY:    return "Unable to load library"; //$NON-NLS-1$
-        case ERROR_CANNOT_INVERT_MATRIX:    return "Cannot invert matrix"; //$NON-NLS-1$
-        case ERROR_NO_GRAPHICS_LIBRARY:    return "Unable to load graphics library"; //$NON-NLS-1$
-        case ERROR_INVALID_FONT:            return "Font not valid"; //$NON-NLS-1$
-        default:
-    }
-    return "Unknown error"; //$NON-NLS-1$
-}
-
-
-/**
- * Returns the NLS'ed message for the given argument.
- *
- * @param key the key to look up
- * @return the message for the given key
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
- * </ul>
- */
-public static char[] getMessage(char[] key) {
-    // PORTING_FIXME: Implement
-    return "msg not found";
-    //return Compatibility.getMessage(key);
-}
-
-/**
- * Returns the SWT platform name.
- * Examples: "win32", "motif", "gtk", "photon", "carbon"
- *
- * @return the SWT platform name
- */
-public static char[] getPlatform () {
-    return Platform.PLATFORM;
-}
-
-/**
- * Returns the SWT version number as an integer.
- * Example: "SWT051" == 51
- *
- * @return the SWT version number
- */
-public static int getVersion () {
-    return Library.SWT_VERSION;
-}
-
-/**
- * Throws an appropriate exception based on the passed in error code.
- *
- * @param code the SWT error code
- */
-public static void error (int code) {
-    error (code, null);
-}
-
-/**
- * Throws an appropriate exception based on the passed in error code.
- * The <code>throwable</code> argument should be either null, or the
- * throwable which caused SWT to throw an exception.
- * <p>
- * In SWT, errors are reported by throwing one of three exceptions:
- * <dl>
- * <dd>java.lang.IllegalArgumentException</dd>
- * <dt>thrown whenever one of the API methods is invoked with an illegal argument</dt>
- * <dd>dwt.SWTException (extends java.lang.RuntimeException)</dd>
- * <dt>thrown whenever a recoverable error happens internally in SWT</dt>
- * <dd>dwt.SWTError (extends java.lang.Error)</dd>
- * <dt>thrown whenever a <b>non-recoverable</b> error happens internally in SWT</dt>
- * </dl>
- * This method provides the logic which maps between error codes
- * and one of the above exceptions.
- * </p>
- *
- * @param code the SWT error code.
- * @param throwable the exception which caused the error to occur.
- *
- * @see SWTError
- * @see SWTException
- * @see IllegalArgumentException
- */
-public static void error (int code, TracedException throwable) {
-    error (code, throwable, null);
-}
-
-/**
- * Throws an appropriate exception based on the passed in error code.
- * The <code>throwable</code> argument should be either null, or the
- * throwable which caused SWT to throw an exception.
- * <p>
- * In SWT, errors are reported by throwing one of three exceptions:
- * <dl>
- * <dd>java.lang.IllegalArgumentException</dd>
- * <dt>thrown whenever one of the API methods is invoked with an illegal argument</dt>
- * <dd>dwt.SWTException (extends java.lang.RuntimeException)</dd>
- * <dt>thrown whenever a recoverable error happens internally in SWT</dt>
- * <dd>dwt.SWTError (extends java.lang.Error)</dd>
- * <dt>thrown whenever a <b>non-recoverable</b> error happens internally in SWT</dt>
- * </dl>
- * This method provides the logic which maps between error codes
- * and one of the above exceptions.
- * </p>
- *
- * @param code the SWT error code.
- * @param throwable the exception which caused the error to occur.
- * @param detail more information about error.
- *
- * @see SWTError
- * @see SWTException
- * @see IllegalArgumentException
- *
- * @since 3.0
- */
-public static void error (int code, TracedException throwable, char[] detail) {
-
-    /*
-    * This code prevents the creation of "chains" of SWTErrors and
-    * SWTExceptions which in turn contain other SWTErrors and
-    * SWTExceptions as their throwable. This can occur when low level
-    * code throws an exception past a point where a higher layer is
-    * being "safe" and catching all exceptions. (Note that, this is
-    * _a_bad_thing_ which we always try to avoid.)
-    *
-    * On the theory that the low level code is closest to the
-    * original problem, we simply re-throw the original exception here.
-    *
-    * NOTE: Exceptions thrown in syncExec and asyncExec must be
-    * wrapped.
-    */
-    if (code != SWT.ERROR_FAILED_EXEC) {
-        if (auto t = cast(SWTError)throwable) throw t;
-        if (auto t = cast(SWTException)throwable) throw t;
-    }
-
-    char[] message = findErrorText (code);
-    if (detail != null) message ~= detail;
-    switch (code) {
-
-        /* Illegal Arguments (non-fatal) */
-        case ERROR_NULL_ARGUMENT:
-        case ERROR_CANNOT_BE_ZERO:
-        case ERROR_INVALID_ARGUMENT:
-        case ERROR_MENU_NOT_BAR:
-        case ERROR_MENU_NOT_DROP_DOWN:
-        case ERROR_MENU_NOT_POP_UP:
-        case ERROR_MENUITEM_NOT_CASCADE:
-        case ERROR_INVALID_PARENT:
-        case ERROR_INVALID_RANGE: {
-            throw new IllegalArgumentException (message);
-        }
-
-        /* SWT Exceptions (non-fatal) */
-        case ERROR_INVALID_SUBCLASS:
-        case ERROR_THREAD_INVALID_ACCESS:
-        case ERROR_WIDGET_DISPOSED:
-        case ERROR_GRAPHIC_DISPOSED:
-        case ERROR_DEVICE_DISPOSED:
-        case ERROR_INVALID_IMAGE:
-        case ERROR_UNSUPPORTED_DEPTH:
-        case ERROR_UNSUPPORTED_FORMAT:
-        case ERROR_FAILED_EXEC:
-        case ERROR_CANNOT_INVERT_MATRIX:
-        case ERROR_NO_GRAPHICS_LIBRARY:
-        case ERROR_IO: {
-            SWTException exception = new SWTException (code, message);
-            exception.throwable = throwable;
-            throw exception;
-        }
-
-        /* Operation System Errors (fatal, may occur only on some platforms) */
-        case ERROR_CANNOT_GET_COUNT:
-        case ERROR_CANNOT_GET_ENABLED:
-        case ERROR_CANNOT_GET_ITEM:
-        case ERROR_CANNOT_GET_ITEM_HEIGHT:
-        case ERROR_CANNOT_GET_SELECTION:
-        case ERROR_CANNOT_GET_TEXT:
-        case ERROR_CANNOT_SET_ENABLED:
-        case ERROR_CANNOT_SET_MENU:
-        case ERROR_CANNOT_SET_SELECTION:
-        case ERROR_CANNOT_SET_TEXT:
-        case ERROR_ITEM_NOT_ADDED:
-        case ERROR_ITEM_NOT_REMOVED:
-        case ERROR_NO_HANDLES:
-        //FALL THROUGH
-
-        /* SWT Errors (fatal, may occur only on some platforms) */
-        case ERROR_FAILED_LOAD_LIBRARY:
-        case ERROR_NO_MORE_CALLBACKS:
-        case ERROR_NOT_IMPLEMENTED:
-        case ERROR_UNSPECIFIED: {
-            SWTError error = new SWTError (code, message);
-            error.throwable = throwable;
-            throw error;
-        }
-        default:
-    }
-
-    /* Unknown/Undefined Error */
-    SWTError error = new SWTError (code, message);
-    error.throwable = throwable;
-    throw error;
-}
-
-public static void static_this() {
-    /*
-    * These values represent bit masks that may need to
-    * expand in the future.  Therefore they are not initialized
-    * in the declaration to stop the compiler from inlining.
-    */
-    BUTTON_MASK = BUTTON1 | BUTTON2 | BUTTON3 | BUTTON4 | BUTTON5;
-    MODIFIER_MASK = ALT | SHIFT | CTRL | COMMAND;
-
-    /*
-    * These values can be different on different platforms.
-    * Therefore they are not initialized in the declaration
-    * to stop the compiler from inlining.
-    */
-    char[] platform = getPlatform ();
-    if ("carbon" == platform ) { //$NON-NLS-1$
-        MOD1 = COMMAND;
-        MOD2 = SHIFT;
-        MOD3 = ALT;
-        MOD4 = CONTROL;
-    } else {
-        MOD1 = CONTROL;
-        MOD2 = SHIFT;
-        MOD3 = ALT;
-        MOD4 = 0;
-    }
-}
-
-}
--- a/dwt/SWTError.d	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.SWTError;
-
-import dwt.SWT;
-
-import tango.core.Exception;
-import tango.io.Stdout;
-
-/**
- * This error is thrown whenever an unrecoverable error
- * occurs internally in SWT. The message text and error code
- * provide a further description of the problem. The exception
- * has a <code>throwable</code> field which holds the underlying
- * throwable that caused the problem (if this information is
- * available (i.e. it may be null)).
- * <p>
- * SWTErrors are thrown when something fails internally which
- * either leaves SWT in an unknown state (eg. the o/s call to
- * remove an item from a list returns an error code) or when SWT
- * is left in a known-to-be-unrecoverable state (eg. it runs out
- * of callback resources). SWTErrors should not occur in typical
- * programs, although "high reliability" applications should
- * still catch them.
- * </p><p>
- * This class also provides support methods used by SWT to match
- * error codes to the appropriate exception class (SWTError,
- * SWTException, or IllegalArgumentException) and to provide
- * human readable strings for SWT error codes.
- * </p>
- *
- * @see SWTException
- * @see SWT#error(int)
- */
-
-public class SWTError : PlatformException {
-    /**
-     * The SWT error code, one of SWT.ERROR_*.
-     */
-    public int code;
-
-    /**
-     * The underlying throwable that caused the problem,
-     * or null if this information is not available.
-     */
-    public TracedException throwable;
-
-    //static final long serialVersionUID = 3833467327105808433L;
-
-/**
- * Constructs a new instance of this class with its
- * stack trace filled in. The error code is set to an
- * unspecified value.
- */
-public this () {
-    this (SWT.ERROR_UNSPECIFIED);
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace and message filled in. The error code is
- * set to an unspecified value.  Specifying <code>null</code>
- * as the message is equivalent to specifying an empty string.
- *
- * @param message the detail message for the exception
- */
-public this (char[] message) {
-    this (SWT.ERROR_UNSPECIFIED, message);
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace and error code filled in.
- *
- * @param code the SWT error code
- */
-public this (int code) {
-    this (code, SWT.findErrorText (code));
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace, error code and message filled in.
- * Specifying <code>null</code> as the message is
- * equivalent to specifying an empty string.
- *
- * @param code the SWT error code
- * @param message the detail message for the exception
- */
-public this (int code, char[] message) {
-    super (message);
-    this.code = code;
-}
-
-/**
- * Returns the underlying throwable that caused the problem,
- * or null if this information is not available.
- * <p>
- * NOTE: This method overrides Throwable.getCause() that was
- * added to JDK1.4. It is necessary to override this method
- * in order for inherited printStackTrace() methods to work.
- * </p>
- * @return the underlying throwable
- *
- * @since 3.1
- */
-public Exception getCause() {
-    return throwable;
-}
-
-/**
- *  Returns the string describing this SWTError object.
- *  <p>
- *  It is combined with the message string of the Throwable
- *  which caused this SWTError (if this information is available).
- *  </p>
- *  @return the error message string of this SWTError object
- */
-public char[] getMessage () {
-    if (throwable is null)
-        return super.toString();
-    return super.toString () ~ " (" ~ throwable.toString () ~ ")"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-/**
- * Outputs a printable representation of this error's
- * stack trace on the standard error stream.
- * <p>
- * Note: printStackTrace(PrintStream) and printStackTrace(PrintWriter)
- * are not provided in order to maintain compatibility with CLDC.
- * </p>
- */
-public void printStackTrace () {
-    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
-    foreach( msg; this ){
-        Stderr.formatln( "{}", msg );
-    }
-    if ( throwable !is null) {
-        Stderr.formatln ("*** Stack trace of contained error ***"); //$NON-NLS-1$
-        foreach( msg; throwable ){
-            Stderr.formatln( "{}", msg );
-        }
-    }
-}
-
-}
--- a/dwt/SWTException.d	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.SWTException;
-
-import dwt.SWT;
-
-import tango.core.Exception;
-import tango.io.Stdout;
-
-/**
- * This runtime exception is thrown whenever a recoverable error
- * occurs internally in SWT. The message text and error code
- * provide a further description of the problem. The exception
- * has a <code>throwable</code> field which holds the underlying
- * exception that caused the problem (if this information is
- * available (i.e. it may be null)).
- * <p>
- * SWTExceptions are thrown when something fails internally,
- * but SWT is left in a known stable state (eg. a widget call
- * was made from a non-u/i thread, or there is failure while
- * reading an Image because the source file was corrupt).
- * </p>
- *
- * @see SWTError
- */
-
-public class SWTException : TracedException {
-    /**
-     * The SWT error code, one of SWT.ERROR_*.
-     */
-    public int code;
-
-    /**
-     * The underlying throwable that caused the problem,
-     * or null if this information is not available.
-     */
-    public TracedException throwable;
-
-    //static final long serialVersionUID = 3257282552304842547L;
-
-/**
- * Constructs a new instance of this class with its
- * stack trace filled in. The error code is set to an
- * unspecified value.
- */
-public this () {
-    this (SWT.ERROR_UNSPECIFIED);
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace and message filled in. The error code is
- * set to an unspecified value.  Specifying <code>null</code>
- * as the message is equivalent to specifying an empty string.
- *
- * @param message the detail message for the exception
- */
-public this (char[] message) {
-    this (SWT.ERROR_UNSPECIFIED, message);
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace and error code filled in.
- *
- * @param code the SWT error code
- */
-public this (int code) {
-    this (code, SWT.findErrorText (code));
-}
-
-/**
- * Constructs a new instance of this class with its
- * stack trace, error code and message filled in.
- * Specifying <code>null</code> as the message is
- * equivalent to specifying an empty string.
- *
- * @param code the SWT error code
- * @param message the detail message for the exception
- */
-public this (int code, char[] message) {
-    super (message);
-    this.code = code;
-}
-
-/**
- * Returns the underlying throwable that caused the problem,
- * or null if this information is not available.
- * <p>
- * NOTE: This method overrides Throwable.getCause() that was
- * added to JDK1.4. It is necessary to override this method
- * in order for inherited printStackTrace() methods to work.
- * </p>
- * @return the underlying throwable
- *
- * @since 3.1
- */
-public TracedException getCause() {
-    return throwable;
-}
-
-/**
- *  Returns the string describing this SWTException object.
- *  <p>
- *  It is combined with the message string of the Throwable
- *  which caused this SWTException (if this information is available).
- *  </p>
- *  @return the error message string of this SWTException object
- */
-public char[] getMessage () {
-    if (throwable is null) return super.toString ();
-    return super.toString () ~ " (" ~ throwable.toString () ~ ")"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-
-/**
- * Outputs a printable representation of this exception's
- * stack trace on the standard error stream.
- * <p>
- * Note: printStackTrace(PrintStream) and printStackTrace(PrintWriter)
- * are not provided in order to maintain compatibility with CLDC.
- * </p>
- */
-public void printStackTrace () {
-    Stderr.formatln( "stacktrace follows (if feature compiled in)" );
-    foreach( msg; this ){
-        Stderr.formatln( "{}", msg );
-    }
-    if ( throwable !is null) {
-        Stderr.formatln ("*** Stack trace of contained exception ***"); //$NON-NLS-1$
-        foreach( msg; throwable ){
-            Stderr.formatln( "{}", msg );
-        }
-    }
-}
-
-}
-
-
--- a/dwt/accessibility/Accessible.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/Accessible.d	Tue Jan 15 06:44:34 2008 +0100
@@ -17,7 +17,7 @@
 import dwt.accessibility.AccessibleFactory;
 import dwt.accessibility.AccessibleObject;
 import tango.core.Thread;
-import dwt.SWT;
+import dwt.DWT;
 //import dwt.events.*;
 import dwt.internal.gtk.OS;
 import dwt.widgets.Control;
@@ -76,7 +76,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -86,7 +86,7 @@
      */
     public void addAccessibleListener (AccessibleListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         accessibleListeners ~= listener;
     }
 
@@ -103,7 +103,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -113,7 +113,7 @@
      */
     public void addAccessibleControlListener (AccessibleControlListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         controlListeners ~= listener;
     }
 
@@ -130,7 +130,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -142,7 +142,7 @@
      */
     public void addAccessibleTextListener (AccessibleTextListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         textListeners ~= listener;
     }
 
@@ -158,8 +158,8 @@
 
     /* checkWidget was copied from Widget, and rewritten to work in this package */
     void checkWidget () {
-        if (!isValidThread ()) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
-        if (control.isDisposed ()) SWT.error (SWT.ERROR_WIDGET_DISPOSED);
+        if (!isValidThread ()) DWT.error (DWT.ERROR_THREAD_INVALID_ACCESS);
+        if (control.isDisposed ()) DWT.error (DWT.ERROR_WIDGET_DISPOSED);
     }
 
     AccessibleListener[] getAccessibleListeners () {
@@ -186,7 +186,7 @@
      * <p>
      * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
      * API for <code>Accessible</code>. It is marked public only so that it
-     * can be shared within the packages provided by SWT. It is not
+     * can be shared within the packages provided by DWT. It is not
      * available on all platforms, and should never be called from
      * application code.
      * </p>
@@ -224,7 +224,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -234,7 +234,7 @@
      */
     public void removeAccessibleControlListener (AccessibleControlListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         remove( controlListeners, listener, delegate bool(AccessibleControlListener a1, AccessibleControlListener a2 ){ return a1 is a2; });
     }
 
@@ -249,7 +249,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -259,7 +259,7 @@
      */
     public void removeAccessibleListener (AccessibleListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         remove( accessibleListeners, listener, delegate bool( AccessibleListener a1, AccessibleListener a2 ){ return a1 is a2; });
     }
 
@@ -274,7 +274,7 @@
      * @exception IllegalArgumentException <ul>
      *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
      * </ul>
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -286,7 +286,7 @@
      */
     public void removeAccessibleTextListener (AccessibleTextListener listener) {
         checkWidget ();
-        if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
         remove( textListeners, listener, delegate bool(AccessibleTextListener a1, AccessibleTextListener a2 ){ return a1 is a2; });
     }
 
@@ -294,7 +294,7 @@
      * Sends a message to accessible clients that the child selection
      * within a custom container control has changed.
      *
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -314,7 +314,7 @@
      *
      * @param childID an identifier specifying a child of the control
      *
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -332,7 +332,7 @@
      *
      * @param index the new caret index within the control
      *
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -355,7 +355,7 @@
      * @param startIndex the text index within the control where the insertion or deletion begins
      * @param length the non-negative length in characters of the insertion or deletion
      *
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
@@ -376,7 +376,7 @@
      * Sends a message to accessible clients that the text
      * selection has changed within a custom control.
      *
-     * @exception SWTException <ul>
+     * @exception DWTException <ul>
      *    <li>ERROR_WIDGET_DISPOSED - if the receiver's control has been disposed</li>
      *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver's control</li>
      * </ul>
--- a/dwt/accessibility/AccessibleControlEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleControlEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 import dwt.accessibility.Accessible;
 
-import dwt.internal.SWTEventObject;
+import dwt.internal.DWTEventObject;
 import tango.text.convert.Format;
 
 /**
@@ -31,7 +31,7 @@
  *
  * @since 2.0
  */
-public class AccessibleControlEvent : SWTEventObject {
+public class AccessibleControlEvent : DWTEventObject {
     public int childID;         // IN/OUT
     public Accessible accessible;   // OUT
     public int x, y;                // IN/OUT
--- a/dwt/accessibility/AccessibleControlListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleControlListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.accessibility.AccessibleControlListener;
 
 import dwt.accessibility.AccessibleControlEvent;
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 
 /**
  * Classes that implement this interface provide methods
@@ -40,7 +40,7 @@
  *
  * @since 2.0
  */
-public interface AccessibleControlListener : SWTEventListener {
+public interface AccessibleControlListener : DWTEventListener {
 
     /**
      * Sent when an accessibility client requests the identifier
--- a/dwt/accessibility/AccessibleEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.accessibility.AccessibleEvent;
 
 
-import dwt.internal.SWTEventObject;
+import dwt.internal.DWTEventObject;
 import tango.text.convert.Format;
 
 /**
@@ -28,7 +28,7 @@
  *
  * @since 2.0
  */
-public class AccessibleEvent : SWTEventObject {
+public class AccessibleEvent : DWTEventObject {
     /**
      * The value of this field is set by an accessibility client
      * before the accessible listener method is called.
--- a/dwt/accessibility/AccessibleFactory.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleFactory.d	Tue Jan 15 06:44:34 2008 +0100
@@ -19,7 +19,7 @@
 import dwt.accessibility.AccessibleControlEvent;
 import dwt.accessibility.AccessibleControlListener;
 
-import dwt.SWT;
+import dwt.DWT;
 
 import tango.stdc.stringz;
 import tango.io.Stdout;
@@ -38,7 +38,7 @@
 
     static uint DefaultParentType; //$NON-NLS-1$
     static const char[] FACTORY_PARENTTYPENAME = "AtkObjectFactory";
-    static const char[] SWT_TYPE_PREFIX = "SWT";
+    static const char[] SWT_TYPE_PREFIX = "DWT";
     static const char[] CHILD_TYPENAME = "Child";
     static const char[] FACTORY_TYPENAME = "SWTFactory";
     static const int[] actionRoles = [
--- a/dwt/accessibility/AccessibleListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.accessibility.AccessibleListener;
 
 
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 import dwt.accessibility.AccessibleEvent;
 
 /**
@@ -37,7 +37,7 @@
  *
  * @since 2.0
  */
-public interface AccessibleListener : SWTEventListener {
+public interface AccessibleListener : DWTEventListener {
 
     /**
      * Sent when an accessibility client requests the name
--- a/dwt/accessibility/AccessibleTextEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleTextEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.accessibility.AccessibleTextEvent;
 
 
-import dwt.internal.SWTEventObject;
+import dwt.internal.DWTEventObject;
 import tango.text.convert.Format;
 
 /**
@@ -30,7 +30,7 @@
  *
  * @since 3.0
  */
-public class AccessibleTextEvent : SWTEventObject {
+public class AccessibleTextEvent : DWTEventObject {
     public int childID;             // IN
     public int offset, length;      // OUT
 
--- a/dwt/accessibility/AccessibleTextListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/accessibility/AccessibleTextListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 import dwt.accessibility.AccessibleTextEvent;
 
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 
 /**
  * Classes that implement this interface provide methods
@@ -41,7 +41,7 @@
  *
  * @since 3.0
  */
-public interface AccessibleTextListener : SWTEventListener {
+public interface AccessibleTextListener : DWTEventListener {
 
     /**
      * Sent when an accessibility client requests the current character offset
--- a/dwt/events/ArmListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/ArmListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.events.ArmListener;
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.ArmEvent;
 
 /**
@@ -27,7 +27,7 @@
  *
  * @see ArmEvent
  */
-public interface ArmListener : SWTEventListener {
+public interface ArmListener : DWTEventListener {
 
 /**
  * Sent when a widget is armed, or 'about to be selected'.
--- a/dwt/events/ControlListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/ControlListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.events.ControlListener;
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.ControlEvent;
 
 /**
@@ -29,7 +29,7 @@
  * @see ControlAdapter
  * @see ControlEvent
  */
-public interface ControlListener : SWTEventListener {
+public interface ControlListener : DWTEventListener {
 
 /**
  * Sent when the location (x, y) of a control changes relative
--- a/dwt/events/DisposeListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/DisposeListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.DisposeListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.DisposeEvent;
 
 /**
@@ -29,7 +29,7 @@
  *
  * @see DisposeEvent
  */
-public interface DisposeListener : SWTEventListener {
+public interface DisposeListener : DWTEventListener {
 
 /**
  * Sent when the widget is disposed.
--- a/dwt/events/DragDetectListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/DragDetectListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.DragDetectListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.DragDetectEvent;
 
 /**
@@ -30,7 +30,7 @@
  *
  * @since 3.3
  */
-public interface DragDetectListener : SWTEventListener {
+public interface DragDetectListener : DWTEventListener {
 
 /**
  * Sent when a drag gesture is detected.
--- a/dwt/events/ExpandListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/ExpandListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.ExpandListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.ExpandEvent;
 
 /**
@@ -32,7 +32,7 @@
  *
  * @since 3.2
  */
-public interface ExpandListener : SWTEventListener {
+public interface ExpandListener : DWTEventListener {
 
 /**
  * Sent when an item is collapsed.
--- a/dwt/events/FocusListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/FocusListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.FocusListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.FocusEvent;
 
 /**
@@ -30,7 +30,7 @@
  * @see FocusAdapter
  * @see FocusEvent
  */
-public interface FocusListener : SWTEventListener {
+public interface FocusListener : DWTEventListener {
 
 /**
  * Sent when a control gets focus.
--- a/dwt/events/HelpListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/HelpListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.HelpListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.HelpEvent;
 
 /**
@@ -29,7 +29,7 @@
  *
  * @see HelpEvent
  */
-public interface HelpListener : SWTEventListener {
+public interface HelpListener : DWTEventListener {
 
 /**
  * Sent when help is requested for a control, typically
--- a/dwt/events/KeyEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/KeyEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -42,29 +42,29 @@
      * This is the final character that results after all modifiers have been
      * applied.  For example, when the user types Ctrl+A, the character value
      * is 0x01.  It is important that applications do not attempt to modify the
-     * character value based on a stateMask (such as SWT.CTRL) or the resulting
+     * character value based on a stateMask (such as DWT.CTRL) or the resulting
      * character will not be correct.
      */
     public char character;
 
     /**
      * the key code of the key that was typed,
-     * as defined by the key code constants in class <code>SWT</code>.
+     * as defined by the key code constants in class <code>DWT</code>.
      * When the character field of the event is ambiguous, this field
      * contains the unicode value of the original character.  For example,
      * typing Ctrl+M or Return both result in the character '\r' but the
      * keyCode field will also contain '\r' when Return was typed.
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int keyCode;
 
     /**
      * the state of the keyboard modifier keys at the time
      * the event was generated, as defined by the key code
-     * constants in class <code>SWT</code>.
+     * constants in class <code>DWT</code>.
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int stateMask;
 
--- a/dwt/events/KeyListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/KeyListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.KeyListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.KeyEvent;
 
 /**
@@ -30,7 +30,7 @@
  * @see KeyAdapter
  * @see KeyEvent
  */
-public interface KeyListener : SWTEventListener {
+public interface KeyListener : DWTEventListener {
 
 /**
  * Sent when a key is pressed on the system keyboard.
--- a/dwt/events/MenuDetectListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MenuDetectListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MenuDetectListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MenuDetectEvent;
 
 /**
@@ -32,7 +32,7 @@
  *
  * @since 3.3
  */
-public interface MenuDetectListener : SWTEventListener {
+public interface MenuDetectListener : DWTEventListener {
 
 /**
  * Sent when the platform-dependent trigger for showing a menu item is detected.
--- a/dwt/events/MenuListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MenuListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MenuListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MenuEvent;
 
 /**
@@ -29,7 +29,7 @@
  * @see MenuAdapter
  * @see MenuEvent
  */
-public interface MenuListener : SWTEventListener {
+public interface MenuListener : DWTEventListener {
 
 /**
  * Sent when a menu is hidden.
--- a/dwt/events/ModifyListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/ModifyListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.ModifyListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.ModifyEvent;
 
 /**
@@ -28,7 +28,7 @@
  *
  * @see ModifyEvent
  */
-public interface ModifyListener : SWTEventListener {
+public interface ModifyListener : DWTEventListener {
 
 /**
  * Sent when the text is modified.
--- a/dwt/events/MouseEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MouseEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -24,7 +24,7 @@
  * <p>
  * Note: The <code>button</code> field is an integer that
  * represents the mouse button number.  This is not the same
- * as the <code>SWT</code> mask constants <code>BUTTONx</code>.
+ * as the <code>DWT</code> mask constants <code>BUTTONx</code>.
  * </p>
  *
  * @see MouseListener
--- a/dwt/events/MouseListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MouseListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2004 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MouseListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MouseEvent;
 
 /**
@@ -30,7 +30,7 @@
  * @see MouseAdapter
  * @see MouseEvent
  */
-public interface MouseListener : SWTEventListener {
+public interface MouseListener : DWTEventListener {
 
 /**
  * Sent when a mouse button is pressed twice within the
--- a/dwt/events/MouseMoveListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MouseMoveListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MouseMoveListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MouseEvent;
 
 /**
@@ -28,7 +28,7 @@
  *
  * @see MouseEvent
  */
-public interface MouseMoveListener : SWTEventListener {
+public interface MouseMoveListener : DWTEventListener {
 
 /**
  * Sent when the mouse moves.
--- a/dwt/events/MouseTrackListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MouseTrackListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MouseTrackListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MouseEvent;
 
 /**
@@ -31,7 +31,7 @@
  * @see MouseTrackAdapter
  * @see MouseEvent
  */
-public interface MouseTrackListener : SWTEventListener {
+public interface MouseTrackListener : DWTEventListener {
 
 /**
  * Sent when the mouse pointer passes into the area of
--- a/dwt/events/MouseWheelListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/MouseWheelListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.MouseWheelListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.MouseEvent;
 
 /**
@@ -31,7 +31,7 @@
  *
  * @since 3.3
  */
-public interface MouseWheelListener : SWTEventListener {
+public interface MouseWheelListener : DWTEventListener {
 
 /**
  * Sent when the mouse wheel is scrolled.
--- a/dwt/events/PaintListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/PaintListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.PaintListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.PaintEvent;
 
 /**
@@ -29,7 +29,7 @@
  *
  * @see PaintEvent
  */
-public interface PaintListener : SWTEventListener {
+public interface PaintListener : DWTEventListener {
 
 /**
  * Sent when a paint event occurs for the control.
--- a/dwt/events/SelectionEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/SelectionEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -37,21 +37,21 @@
      * Extra detail information about the selection, depending on the widget.
      *
      * <p><b>Sash</b><ul>
-     * <li>{@link dwt.SWT#DRAG}</li>
+     * <li>{@link dwt.DWT#DRAG}</li>
      * </ul></p><p><b>ScrollBar and Slider</b><ul>
-     * <li>{@link dwt.SWT#DRAG}</li>
-     * <li>{@link dwt.SWT#HOME}</li>
-     * <li>{@link dwt.SWT#END}</li>
-     * <li>{@link dwt.SWT#ARROW_DOWN}</li>
-     * <li>{@link dwt.SWT#ARROW_UP}</li>
-     * <li>{@link dwt.SWT#PAGE_DOWN}</li>
-     * <li>{@link dwt.SWT#PAGE_UP}</li>
+     * <li>{@link dwt.DWT#DRAG}</li>
+     * <li>{@link dwt.DWT#HOME}</li>
+     * <li>{@link dwt.DWT#END}</li>
+     * <li>{@link dwt.DWT#ARROW_DOWN}</li>
+     * <li>{@link dwt.DWT#ARROW_UP}</li>
+     * <li>{@link dwt.DWT#PAGE_DOWN}</li>
+     * <li>{@link dwt.DWT#PAGE_UP}</li>
      * </ul></p><p><b>Table and Tree</b><ul>
-     * <li>{@link dwt.SWT#CHECK}</li>
+     * <li>{@link dwt.DWT#CHECK}</li>
      * </ul></p><p><b>Text</b><ul>
-     * <li>{@link dwt.SWT#CANCEL}</li>
+     * <li>{@link dwt.DWT#CANCEL}</li>
      * </ul></p><p><b>CoolItem and ToolItem</b><ul>
-     * <li>{@link dwt.SWT#ARROW}</li>
+     * <li>{@link dwt.DWT#ARROW}</li>
      * </ul></p>
      */
     public int detail;
--- a/dwt/events/SelectionListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/SelectionListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.SelectionListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.SelectionEvent;
 
 /**
@@ -30,7 +30,7 @@
  * @see SelectionAdapter
  * @see SelectionEvent
  */
-public interface SelectionListener : SWTEventListener {
+public interface SelectionListener : DWTEventListener {
 
 /**
  * Sent when selection occurs in the control.
--- a/dwt/events/ShellListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/ShellListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.ShellListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.ShellEvent;
 
 /**
@@ -29,7 +29,7 @@
  * @see ShellAdapter
  * @see ShellEvent
  */
-public interface ShellListener : SWTEventListener {
+public interface ShellListener : DWTEventListener {
 
 /**
  * Sent when a shell becomes the active window.
--- a/dwt/events/TraverseEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/TraverseEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -84,16 +84,16 @@
     /**
      * The traversal type.
      * <p><ul>
-     * <li>{@link dwt.SWT#TRAVERSE_NONE}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_ESCAPE}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_RETURN}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_TAB_NEXT}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_TAB_PREVIOUS}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_ARROW_NEXT}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_ARROW_PREVIOUS}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_MNEMONIC}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_PAGE_NEXT}</li>
-     * <li>{@link dwt.SWT#TRAVERSE_PAGE_PREVIOUS}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_NONE}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_ESCAPE}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_RETURN}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_TAB_NEXT}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_TAB_PREVIOUS}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_ARROW_NEXT}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_ARROW_PREVIOUS}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_MNEMONIC}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_PAGE_NEXT}</li>
+     * <li>{@link dwt.DWT#TRAVERSE_PAGE_PREVIOUS}</li>
      * </ul></p>
      *
      * Setting this field will change the type of traversal.
--- a/dwt/events/TraverseListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/TraverseListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.TraverseListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.TraverseEvent;
 
 /**
@@ -29,7 +29,7 @@
  *
  * @see TraverseEvent
  */
-public interface TraverseListener : SWTEventListener {
+public interface TraverseListener : DWTEventListener {
 
 /**
  * Sent when a traverse event occurs in a control.
@@ -38,7 +38,7 @@
  * key. Traversal keys are typically tab and arrow keys, along
  * with certain other keys on some platforms. Traversal key
  * constants beginning with <code>TRAVERSE_</code> are defined
- * in the <code>SWT</code> class.
+ * in the <code>DWT</code> class.
  * </p>
  *
  * @param e an event containing information about the traverse
--- a/dwt/events/TreeListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/TreeListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.TreeListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.TreeEvent;
 
 /**
@@ -30,7 +30,7 @@
  * @see TreeAdapter
  * @see TreeEvent
  */
-public interface TreeListener : SWTEventListener {
+public interface TreeListener : DWTEventListener {
 
 /**
  * Sent when a tree branch is collapsed.
--- a/dwt/events/TypedEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/TypedEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,19 +14,19 @@
 import dwt.widgets.Event;
 import dwt.widgets.Display;
 import dwt.widgets.Widget;
-import dwt.internal.SWTEventObject;
+import dwt.internal.DWTEventObject;
 
 import tango.text.convert.Format;
 import tango.text.Util : split;
 
 /**
  * This is the super class for all typed event classes provided
- * by SWT. Typed events contain particular information which is
+ * by DWT. Typed events contain particular information which is
  * applicable to the event occurrence.
  *
  * @see dwt.widgets.Event
  */
-public class TypedEvent : SWTEventObject {
+public class TypedEvent : DWTEventObject {
 
     /**
      * the display where the event occurred
--- a/dwt/events/VerifyListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/events/VerifyListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.events.VerifyListener;
 
 
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 public import dwt.events.VerifyEvent;
 
 /**
@@ -29,7 +29,7 @@
  *
  * @see VerifyEvent
  */
-public interface VerifyListener : SWTEventListener {
+public interface VerifyListener : DWTEventListener {
 
 /**
  * Sent when the text is about to be modified.
--- a/dwt/graphics/Color.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Color.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.Color;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Resource;
 import dwt.graphics.RGB;
@@ -22,7 +22,7 @@
 
 /**
  * Instances of this class manage the operating system resources that
- * implement SWT's RGB color model. To create a color you can either
+ * implement DWT'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>
@@ -39,9 +39,9 @@
      * the handle to the OS color resource
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -76,7 +76,7 @@
  */
 public this(Device device, int red, int green, int blue) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, red, green, blue);
     if (device.tracking) device.new_Object(this);
 }
@@ -105,8 +105,8 @@
  */
 public this(Device device, RGB rgb) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (rgb is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (rgb is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, rgb.red, rgb.green, rgb.blue);
     if (device.tracking) device.new_Object(this);
 }
@@ -159,12 +159,12 @@
  *
  * @return the blue component of the color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getBlue() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return (handle.blue >> 8) & 0xFF;
 }
 
@@ -173,12 +173,12 @@
  *
  * @return the green component of the color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getGreen() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return (handle.green >> 8) & 0xFF;
 }
 
@@ -187,12 +187,12 @@
  *
  * @return the red component of the color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getRed() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return (handle.red >> 8) & 0xFF;
 }
 
@@ -216,12 +216,12 @@
  *
  * @return the RGB for the color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public RGB getRGB () {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return new RGB(getRed(), getGreen(), getBlue());
 }
 
@@ -230,7 +230,7 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>Color</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -253,7 +253,7 @@
     if ((red > 255) || (red < 0) ||
         (green > 255) || (green < 0) ||
         (blue > 255) || (blue < 0)) {
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     GdkColor* gdkColor = new GdkColor();
     gdkColor.red = cast(short)((red & 0xFF) | ((red & 0xFF) << 8));
--- a/dwt/graphics/Cursor.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Cursor.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.Cursor;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Resource;
 import dwt.graphics.Device;
 import dwt.graphics.ImageData;
@@ -52,9 +52,9 @@
      * the handle to the OS cursor resource
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -103,70 +103,70 @@
  *    <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>
+ * @exception DWTError <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
+ * @see DWT#CURSOR_ARROW
+ * @see DWT#CURSOR_WAIT
+ * @see DWT#CURSOR_CROSS
+ * @see DWT#CURSOR_APPSTARTING
+ * @see DWT#CURSOR_HELP
+ * @see DWT#CURSOR_SIZEALL
+ * @see DWT#CURSOR_SIZENESW
+ * @see DWT#CURSOR_SIZENS
+ * @see DWT#CURSOR_SIZENWSE
+ * @see DWT#CURSOR_SIZEWE
+ * @see DWT#CURSOR_SIZEN
+ * @see DWT#CURSOR_SIZES
+ * @see DWT#CURSOR_SIZEE
+ * @see DWT#CURSOR_SIZEW
+ * @see DWT#CURSOR_SIZENE
+ * @see DWT#CURSOR_SIZESE
+ * @see DWT#CURSOR_SIZESW
+ * @see DWT#CURSOR_SIZENW
+ * @see DWT#CURSOR_UPARROW
+ * @see DWT#CURSOR_IBEAM
+ * @see DWT#CURSOR_NO
+ * @see DWT#CURSOR_HAND
  */
 public this(Device device, int style) {
     if (device == null) device = Device.getDevice();
-    if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     int shape = 0;
     switch (style) {
-        case SWT.CURSOR_APPSTARTING:    break;
-        case SWT.CURSOR_ARROW:          shape = OS.GDK_LEFT_PTR; break;
-        case SWT.CURSOR_WAIT:           shape = OS.GDK_WATCH; break;
-        case SWT.CURSOR_CROSS:          shape = OS.GDK_CROSS; break;
-        case SWT.CURSOR_HAND:           shape = OS.GDK_HAND2; break;
-        case SWT.CURSOR_HELP:           shape = OS.GDK_QUESTION_ARROW; break;
-        case SWT.CURSOR_SIZEALL:        shape = OS.GDK_FLEUR; break;
-        case SWT.CURSOR_SIZENESW:       shape = OS.GDK_SIZING; break;
-        case SWT.CURSOR_SIZENS:         shape = OS.GDK_DOUBLE_ARROW; break;
-        case SWT.CURSOR_SIZENWSE:       shape = OS.GDK_SIZING; break;
-        case SWT.CURSOR_SIZEWE:         shape = OS.GDK_SB_H_DOUBLE_ARROW; break;
-        case SWT.CURSOR_SIZEN:          shape = OS.GDK_TOP_SIDE; break;
-        case SWT.CURSOR_SIZES:          shape = OS.GDK_BOTTOM_SIDE; break;
-        case SWT.CURSOR_SIZEE:          shape = OS.GDK_RIGHT_SIDE; break;
-        case SWT.CURSOR_SIZEW:          shape = OS.GDK_LEFT_SIDE; break;
-        case SWT.CURSOR_SIZENE:         shape = OS.GDK_TOP_RIGHT_CORNER; break;
-        case SWT.CURSOR_SIZESE:         shape = OS.GDK_BOTTOM_RIGHT_CORNER; break;
-        case SWT.CURSOR_SIZESW:         shape = OS.GDK_BOTTOM_LEFT_CORNER; break;
-        case SWT.CURSOR_SIZENW:         shape = OS.GDK_TOP_LEFT_CORNER; break;
-        case SWT.CURSOR_UPARROW:        shape = OS.GDK_SB_UP_ARROW; break;
-        case SWT.CURSOR_IBEAM:          shape = OS.GDK_XTERM; break;
-        case SWT.CURSOR_NO:             shape = OS.GDK_X_CURSOR; break;
+        case DWT.CURSOR_APPSTARTING:    break;
+        case DWT.CURSOR_ARROW:          shape = OS.GDK_LEFT_PTR; break;
+        case DWT.CURSOR_WAIT:           shape = OS.GDK_WATCH; break;
+        case DWT.CURSOR_CROSS:          shape = OS.GDK_CROSS; break;
+        case DWT.CURSOR_HAND:           shape = OS.GDK_HAND2; break;
+        case DWT.CURSOR_HELP:           shape = OS.GDK_QUESTION_ARROW; break;
+        case DWT.CURSOR_SIZEALL:        shape = OS.GDK_FLEUR; break;
+        case DWT.CURSOR_SIZENESW:       shape = OS.GDK_SIZING; break;
+        case DWT.CURSOR_SIZENS:         shape = OS.GDK_DOUBLE_ARROW; break;
+        case DWT.CURSOR_SIZENWSE:       shape = OS.GDK_SIZING; break;
+        case DWT.CURSOR_SIZEWE:         shape = OS.GDK_SB_H_DOUBLE_ARROW; break;
+        case DWT.CURSOR_SIZEN:          shape = OS.GDK_TOP_SIDE; break;
+        case DWT.CURSOR_SIZES:          shape = OS.GDK_BOTTOM_SIDE; break;
+        case DWT.CURSOR_SIZEE:          shape = OS.GDK_RIGHT_SIDE; break;
+        case DWT.CURSOR_SIZEW:          shape = OS.GDK_LEFT_SIDE; break;
+        case DWT.CURSOR_SIZENE:         shape = OS.GDK_TOP_RIGHT_CORNER; break;
+        case DWT.CURSOR_SIZESE:         shape = OS.GDK_BOTTOM_RIGHT_CORNER; break;
+        case DWT.CURSOR_SIZESW:         shape = OS.GDK_BOTTOM_LEFT_CORNER; break;
+        case DWT.CURSOR_SIZENW:         shape = OS.GDK_TOP_LEFT_CORNER; break;
+        case DWT.CURSOR_UPARROW:        shape = OS.GDK_SB_UP_ARROW; break;
+        case DWT.CURSOR_IBEAM:          shape = OS.GDK_XTERM; break;
+        case DWT.CURSOR_NO:             shape = OS.GDK_X_CURSOR; break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
-    if (shape == 0 && style == SWT.CURSOR_APPSTARTING) {
+    if (shape == 0 && style == DWT.CURSOR_APPSTARTING) {
         handle = createCursor(APPSTARTING_SRC, APPSTARTING_MASK, 32, 32, 2, 2, true);
     } else {
         handle = OS.gdk_cursor_new(shape);
     }
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -197,27 +197,27 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the source and the mask are not the same
  *          size, or if the hotspot is outside the bounds of the image</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>
  * </ul>
  */
 public this(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY) {
     if (device == null) device = Device.getDevice();
-    if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
-    if (source == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (source == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (mask == null) {
-        if (!(source.getTransparencyType() == SWT.TRANSPARENCY_MASK)) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+        if (!(source.getTransparencyType() == DWT.TRANSPARENCY_MASK)) DWT.error(DWT.ERROR_NULL_ARGUMENT);
         mask = source.getTransparencyMask();
     }
     /* Check the bounds. Mask must be the same size as source */
     if (mask.width != source.width || mask.height != source.height) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     /* Check the hotspots */
     if (hotspotX >= source.width || hotspotX < 0 ||
         hotspotY >= source.height || hotspotY < 0) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     /* Convert depth to 1 */
     source = ImageData.convertMask(source);
@@ -255,7 +255,7 @@
     }
     maskData = ImageData.convertPad(maskData, mask.width, mask.height, mask.depth, mask.scanlinePad, 1);
     handle = createCursor(maskData, sourceData, source.width, source.height, hotspotX, hotspotY, true);
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -280,7 +280,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the hotspot is outside the bounds of the
  *       image</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if a handle could not be obtained for cursor creation</li>
  * </ul>
  *
@@ -288,12 +288,12 @@
  */
 public this(Device device, ImageData source, int hotspotX, int hotspotY) {
     if (device == null) device = Device.getDevice();
-    if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
-    if (source == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (source == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (hotspotX >= source.width || hotspotX < 0 ||
         hotspotY >= source.height || hotspotY < 0) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     GdkDisplay* display;
     if (OS.GTK_VERSION >= OS.buildVERSION(2, 4, 0) && OS.gdk_display_supports_cursor_color(display = OS.gdk_display_get_default ())) {
@@ -301,7 +301,7 @@
         int height = source.height;
         PaletteData palette = source.palette;
         auto pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
-        if (pixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (pixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
         int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
         auto data = OS.gdk_pixbuf_get_pixels(pixbuf);
         byte[] buffer = source.data;
@@ -433,7 +433,7 @@
         maskData = ImageData.convertPad(maskData, mask.width, mask.height, mask.depth, mask.scanlinePad, 1);
         handle = createCursor(sourceData, maskData, source.width, source.height, hotspotX, hotspotY, false);
     }
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -490,7 +490,7 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>Cursor</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
--- a/dwt/graphics/Device.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Device.d	Tue Jan 15 06:44:34 2008 +0100
@@ -19,8 +19,8 @@
 import dwt.graphics.Font;
 import dwt.graphics.GCData;
 import dwt.dwthelper.Runnable;
-import dwt.SWT;
-import dwt.SWTError;
+import dwt.DWT;
+import dwt.DWTError;
 import dwt.internal.Compatibility;
 import dwt.internal.gtk.OS;
 
@@ -39,9 +39,9 @@
      * the handle to the X Display
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked protected only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -102,8 +102,8 @@
     * TEMPORARY CODE. When a graphics object is
     * created and the device parameter is null,
     * the current Display is used. This presents
-    * a problem because SWT graphics does not
-    * reference classes in SWT widgets. The correct
+    * a problem because DWT graphics does not
+    * reference classes in DWT widgets. The correct
     * fix is to remove this feature. Unfortunately,
     * too many application programs rely on this
     * feature.
@@ -181,26 +181,26 @@
 }
 
 /**
- * Throws an <code>SWTException</code> if the receiver can not
+ * Throws an <code>DWTException</code> if the receiver can not
  * be accessed by the caller. This may include both checks on
  * the state of the receiver and more generally on the entire
  * execution context. This method <em>should</em> be called by
- * device implementors to enforce the standard SWT invariants.
+ * device implementors to enforce the standard DWT invariants.
  * <p>
  * Currently, it is an error to invoke any method (other than
  * <code>isDisposed()</code> and <code>dispose()</code>) on a
  * device that has had its <code>dispose()</code> method called.
  * </p><p>
- * In future releases of SWT, there may be more or fewer error
+ * In future releases of DWT, there may be more or fewer error
  * checks and exceptions may be thrown for different reasons.
  * <p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 protected void checkDevice () {
-    if (disposed) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
+    if (disposed) DWT.error(DWT.ERROR_DEVICE_DISPOSED);
 }
 
 /**
@@ -293,7 +293,7 @@
  *
  * @return the bounding rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -309,7 +309,7 @@
  *
  * @return a <code>DeviceData</code> containing the device's data and attributes
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -344,7 +344,7 @@
  *
  * @return the client area
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -363,7 +363,7 @@
  *
  * @return the depth of the screen
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -379,7 +379,7 @@
  *
  * @return the horizontal and vertical DPI
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -397,7 +397,7 @@
  * @param scalable if true only scalable fonts are returned, otherwise only non-scalable fonts are returned.
  * @return the matching font data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -451,8 +451,8 @@
 /**
  * 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
+ * specified in class <code>DWT</code>. Any value other
+ * than one of the DWT color constants which is passed
  * in will result in the color black. This color should
  * not be freed because it was allocated by the system,
  * not the application.
@@ -460,31 +460,31 @@
  * @param id the color constant
  * @return the matching color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
- * @see SWT
+ * @see DWT
  */
 public Color getSystemColor (int id) {
     checkDevice ();
     switch (id) {
-        case SWT.COLOR_BLACK:               return COLOR_BLACK;
-        case SWT.COLOR_DARK_RED:            return COLOR_DARK_RED;
-        case SWT.COLOR_DARK_GREEN:          return COLOR_DARK_GREEN;
-        case SWT.COLOR_DARK_YELLOW:         return COLOR_DARK_YELLOW;
-        case SWT.COLOR_DARK_BLUE:           return COLOR_DARK_BLUE;
-        case SWT.COLOR_DARK_MAGENTA:        return COLOR_DARK_MAGENTA;
-        case SWT.COLOR_DARK_CYAN:           return COLOR_DARK_CYAN;
-        case SWT.COLOR_GRAY:                return COLOR_GRAY;
-        case SWT.COLOR_DARK_GRAY:           return COLOR_DARK_GRAY;
-        case SWT.COLOR_RED:                 return COLOR_RED;
-        case SWT.COLOR_GREEN:               return COLOR_GREEN;
-        case SWT.COLOR_YELLOW:              return COLOR_YELLOW;
-        case SWT.COLOR_BLUE:                return COLOR_BLUE;
-        case SWT.COLOR_MAGENTA:             return COLOR_MAGENTA;
-        case SWT.COLOR_CYAN:                return COLOR_CYAN;
-        case SWT.COLOR_WHITE:               return COLOR_WHITE;
+        case DWT.COLOR_BLACK:               return COLOR_BLACK;
+        case DWT.COLOR_DARK_RED:            return COLOR_DARK_RED;
+        case DWT.COLOR_DARK_GREEN:          return COLOR_DARK_GREEN;
+        case DWT.COLOR_DARK_YELLOW:         return COLOR_DARK_YELLOW;
+        case DWT.COLOR_DARK_BLUE:           return COLOR_DARK_BLUE;
+        case DWT.COLOR_DARK_MAGENTA:        return COLOR_DARK_MAGENTA;
+        case DWT.COLOR_DARK_CYAN:           return COLOR_DARK_CYAN;
+        case DWT.COLOR_GRAY:                return COLOR_GRAY;
+        case DWT.COLOR_DARK_GRAY:           return COLOR_DARK_GRAY;
+        case DWT.COLOR_RED:                 return COLOR_RED;
+        case DWT.COLOR_GREEN:               return COLOR_GREEN;
+        case DWT.COLOR_YELLOW:              return COLOR_YELLOW;
+        case DWT.COLOR_BLUE:                return COLOR_BLUE;
+        case DWT.COLOR_MAGENTA:             return COLOR_MAGENTA;
+        case DWT.COLOR_CYAN:                return COLOR_CYAN;
+        case DWT.COLOR_WHITE:               return COLOR_WHITE;
         default:
     }
     return COLOR_BLACK;
@@ -506,7 +506,7 @@
  *
  * @return a font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -522,7 +522,7 @@
  *
  * @return <code>true</code>if warnings are being handled, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -601,11 +601,11 @@
     COLOR_WHITE = new Color (this, 0xFF,0xFF,0xFF);
 
     emptyTab = OS.pango_tab_array_new(1, false);
-    if (emptyTab is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (emptyTab is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.pango_tab_array_set_tab(emptyTab, 0, OS.PANGO_TAB_LEFT, 1);
 
     shellHandle = OS.gtk_window_new(OS.GTK_WINDOW_TOPLEVEL);
-    if (shellHandle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (shellHandle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.gtk_widget_realize(shellHandle);
 }
 
@@ -614,7 +614,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -629,7 +629,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -660,7 +660,7 @@
  * @param path the font file path
  * @return whether the font was successfully loaded
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if path is null</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -671,7 +671,7 @@
  */
 public bool loadFont (char[] path) {
     checkDevice();
-    if (path is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (path is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     return cast(bool) OS.FcConfigAppFontAddFile (null, toStringz(path));
 }
 
@@ -789,7 +789,7 @@
  *
  * @param warnings <code>true</code>if warnings should be printed, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -829,7 +829,7 @@
             //OS.Call (XErrorProc, xDisplay, xErrorEvent);
         }
     } else {
-        if (DEBUG) (new SWTError ()).printStackTrace ();
+        if (DEBUG) (new DWTError ()).printStackTrace ();
         //PORTING_FIXME ??
         //OS.Call (XErrorProc, xDisplay, xErrorEvent);
     }
--- a/dwt/graphics/DeviceData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/DeviceData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -16,9 +16,9 @@
     /*
     * The following fields are platform dependent.
     * <p>
-    * <b>IMPORTANT:</b> These fields are <em>not</em> part of the SWT
+    * <b>IMPORTANT:</b> These fields are <em>not</em> part of the DWT
     * public API. They are marked public only so that they can be shared
-    * within the packages provided by SWT. They are not available on all
+    * within the packages provided by DWT. They are not available on all
     * platforms and should never be accessed from application code.
     * </p>
     */
@@ -28,7 +28,7 @@
 
     /*
     * Debug fields - may not be honoured
-    * on some SWT platforms.
+    * on some DWT platforms.
     */
     public bool debugging;
     public bool tracking;
--- a/dwt/graphics/Drawable.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Drawable.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2004 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,12 +17,12 @@
 /**
  * Implementers of <code>Drawable</code> can have a graphics context (GC)
  * created for them, and then they can be drawn on by sending messages to
- * their associated GC. SWT images, and device objects such as the Display
+ * their associated GC. DWT images, and device objects such as the Display
  * device and the Printer device, are drawables.
  * <p>
- * <b>IMPORTANT:</b> This class is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This class is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  *
@@ -37,7 +37,7 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>Drawable</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -53,7 +53,7 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>Drawable</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
--- a/dwt/graphics/Font.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Font.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.Font;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Resource;
 import dwt.graphics.FontData;
 import dwt.graphics.Device;
@@ -39,9 +39,9 @@
      * the handle to the OS font resource
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -64,14 +64,14 @@
  *    <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>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if a font could not be created from the given font data</li>
  * </ul>
  */
 public this(Device device, FontData fd) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (fd is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (fd is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
     if (device.tracking) device.new_Object(this);
 }
@@ -93,7 +93,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the length of fds is zero</li>
  *    <li>ERROR_NULL_ARGUMENT - if any fd in the array is null</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if a font could not be created from the given font data</li>
  * </ul>
  *
@@ -101,11 +101,11 @@
  */
 public this(Device device, FontData[] fds) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (fds is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (fds.length == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (fds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (fds.length == 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     for (int i=0; i<fds.length; i++) {
-        if (fds[i] is null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        if (fds[i] is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     FontData fd = fds[0];
     init(device,fd.getName(), fd.getHeightF(), fd.getStyle(), fd.str);
@@ -130,20 +130,20 @@
  *    <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>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if a font could not be created from the given arguments</li>
  * </ul>
  */
 public this(Device device, char[] name, int height, int style) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, name, height, style, null);
     if (device.tracking) device.new_Object(this);
 }
 
 /*public*/ this(Device device, char[] name, float height, int style) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, name, height, style, null);
     if (device.tracking) device.new_Object(this);
 }
@@ -189,22 +189,22 @@
  *
  * @return an array of font data objects describing the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public FontData[] getFontData() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 
     auto family = OS.pango_font_description_get_family(handle);
     char[] name = fromUtf8z( family );
     float height = cast(float)OS.pango_font_description_get_size(handle) / OS.PANGO_SCALE;
     int pangoStyle = OS.pango_font_description_get_style(handle);
     int pangoWeight = OS.pango_font_description_get_weight(handle);
-    int style = SWT.NORMAL;
-    if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC;
-    if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN;
-    if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD;
+    int style = DWT.NORMAL;
+    if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= DWT.ITALIC;
+    if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= DWT.ROMAN;
+    if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= DWT.BOLD;
     auto fontString = OS.pango_font_description_to_string (handle);
     auto buffer = fromUtf8z( fontString ).dup;
     FontData data = new FontData( buffer , height, style);
@@ -218,7 +218,7 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>Font</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -251,24 +251,24 @@
 }
 
 void init(Device device, char[] name, float height, int style, char[] fontString) {
-    if (name is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.device = device;
     if (fontString !is null) {
         handle = OS.pango_font_description_from_string (toStringz(fontString));
-        if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     } else {
         handle = OS.pango_font_description_new();
-        if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
         //byte[] buffer = Converter.wcsToMbcs(null, name, true);
         OS.pango_font_description_set_family(handle, toStringz(name) );
         OS.pango_font_description_set_size(handle, cast(int)(0.5f + height * OS.PANGO_SCALE));
         OS.pango_font_description_set_stretch(handle, OS.PANGO_STRETCH_NORMAL);
         int pangoStyle = OS.PANGO_STYLE_NORMAL;
         int pangoWeight = OS.PANGO_WEIGHT_NORMAL;
-        if ((style & SWT.ITALIC) != 0) pangoStyle = OS.PANGO_STYLE_ITALIC;
-        if ((style & SWT.ROMAN) != 0) pangoStyle = OS.PANGO_STYLE_OBLIQUE;
-        if ((style & SWT.BOLD) != 0) pangoWeight = OS.PANGO_WEIGHT_BOLD;
+        if ((style & DWT.ITALIC) != 0) pangoStyle = OS.PANGO_STYLE_ITALIC;
+        if ((style & DWT.ROMAN) != 0) pangoStyle = OS.PANGO_STYLE_OBLIQUE;
+        if ((style & DWT.BOLD) != 0) pangoWeight = OS.PANGO_WEIGHT_BOLD;
         OS.pango_font_description_set_style(handle, pangoStyle);
         OS.pango_font_description_set_weight(handle, pangoWeight);
     }
--- a/dwt/graphics/FontData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/FontData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.FontData;
 
 
-import dwt.SWT;
+import dwt.DWT;
 
 import tango.text.convert.Format;
 import tango.text.Util : locate;
@@ -46,9 +46,9 @@
      * the font name
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -58,9 +58,9 @@
      * The height of the font data in points
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -70,9 +70,9 @@
      * the font style
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -82,9 +82,9 @@
      * the Pango string
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -99,7 +99,7 @@
  * Constructs a new uninitialized font data.
  */
 public this () {
-    this("", 12, SWT.NORMAL);
+    this("", 12, DWT.NORMAL);
 }
 
 /**
@@ -122,40 +122,40 @@
  * @see #toString
  */
 public this(char[] str) {
-    if (str is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (str is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     int start = 0;
     int end = locate( str, '|' );
-    if (end == str.length ) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (end == str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     char[] version1 = str[ start .. end ];
     try {
-        if (to!(int)(version1) != 1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        if (to!(int)(version1) != 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     } catch (ConversionException e) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
 
     start = end + 1;
     end = locate( str, '|', start );
-    if (end == str.length ) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (end == str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     char[] name = str[start .. end ];
 
     start = end + 1;
     end = locate( str, '|', start );
-    if (end == str.length ) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (end == str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     float height = 0;
     try {
         height = to!(float)(str[start .. end]);
     } catch (ConversionException e) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
 
     start = end + 1;
     end = locate( str, '|', start );
-    if (end == str.length ) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (end == str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     int style = 0;
     try {
         style = to!(int)( str[start .. end ]);
     } catch (ConversionException e) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
 
     start = end + 1;
@@ -290,7 +290,7 @@
 
 /**
  * Returns the style of the receiver which is a bitwise OR of
- * one or more of the <code>SWT</code> constants NORMAL, BOLD
+ * one or more of the <code>DWT</code> constants NORMAL, BOLD
  * and ITALIC.
  *
  * @return the style of this <code>FontData</code>
@@ -329,13 +329,13 @@
  * @see #getHeight
  */
 public void setHeight(int height) {
-    if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.height = height;
     this.str = null;
 }
 
 /*public*/ void setHeight(float height) {
-    if (height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.height = height;
     this.str = null;
 }
@@ -403,14 +403,14 @@
  * @see #getName
  */
 public void setName(char[] name) {
-    if (name is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.name = name;
     this.str = 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>
+ * be a bitwise OR of one or more of the <code>DWT</code>
  * constants NORMAL, BOLD and ITALIC.  All other style bits are
  * ignored.
  *
--- a/dwt/graphics/GC.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/GC.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,9 +13,9 @@
 import dwt.graphics.Image;
 
 
-import dwt.SWT;
-import dwt.SWTException;
-import dwt.SWTError;
+import dwt.DWT;
+import dwt.DWTException;
+import dwt.DWTError;
 import dwt.graphics.Color;
 import dwt.graphics.Drawable;
 import dwt.graphics.Resource;
@@ -82,7 +82,7 @@
 
 /**
  * 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
+ * supported by DWT are located. Instances are used to draw on either an
  * <code>Image</code>, a <code>Control</code>, or directly on a <code>Display</code>.
  * <dl>
  * <dt><b>Styles:</b></dt>
@@ -90,7 +90,7 @@
  * </dl>
  *
  * <p>
- * The SWT drawing coordinate system is the two-dimensional space with the origin
+ * The DWT drawing coordinate system is the two-dimensional space with the origin
  * (0,0) at the top left corner of the drawing area and with (x,y) values increasing
  * to the right and downward respectively.
  * </p>
@@ -114,9 +114,9 @@
      * the handle to the OS device context
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -167,7 +167,7 @@
  *          - if the drawable is an image or printer that is already selected
  *            into another graphics context</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for GC creation</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS if not called from the thread that created the drawable</li>
  * </ul>
@@ -196,7 +196,7 @@
  *          - if the drawable is an image or printer that is already selected
  *            into another graphics context</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for GC creation</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS if not called from the thread that created the drawable</li>
  * </ul>
@@ -204,13 +204,13 @@
  * @since 2.1.2
  */
 public this(Drawable drawable, int style) {
-    if (drawable is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (drawable is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     GCData data = new GCData();
     data.style = checkStyle(style);
     auto gdkGC = drawable.internal_new_GC(data);
     Device device = data.device;
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = data.device = device;
     init(drawable, data, gdkGC);
     if (device.tracking) device.new_Object(this);
@@ -220,7 +220,7 @@
     char[] buffer = str.dup;
     if (OS.GTK_VERSION >= OS.buildVERSION(2, 8, 0)) {
         auto layout = OS.pango_cairo_create_layout(cairo);
-        if (layout is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (layout is null) DWT.error(DWT.ERROR_NO_HANDLES);
         OS.pango_layout_set_text(layout, buffer.ptr, -1);
         OS.pango_layout_set_font_description(layout, font.handle);
         Cairo.cairo_move_to(cairo, x, y);
@@ -237,8 +237,8 @@
 }
 
 static int checkStyle (int style) {
-    if ((style & SWT.LEFT_TO_RIGHT) !is 0) style &= ~SWT.RIGHT_TO_LEFT;
-    return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
+    if ((style & DWT.LEFT_TO_RIGHT) !is 0) style &= ~DWT.RIGHT_TO_LEFT;
+    return style & (DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT);
 }
 
 public static GC gtk_new(Drawable drawable, GCData data) {
@@ -285,9 +285,9 @@
         if ((state & LINE_CAP) !is 0) {
             int cap_style = 0;
             switch (data.lineCap) {
-                case SWT.CAP_ROUND: cap_style = Cairo.CAIRO_LINE_CAP_ROUND; break;
-                case SWT.CAP_FLAT: cap_style = Cairo.CAIRO_LINE_CAP_BUTT; break;
-                case SWT.CAP_SQUARE: cap_style = Cairo.CAIRO_LINE_CAP_SQUARE; break;
+                case DWT.CAP_ROUND: cap_style = Cairo.CAIRO_LINE_CAP_ROUND; break;
+                case DWT.CAP_FLAT: cap_style = Cairo.CAIRO_LINE_CAP_BUTT; break;
+                case DWT.CAP_SQUARE: cap_style = Cairo.CAIRO_LINE_CAP_SQUARE; break;
                 default:
             }
             Cairo.cairo_set_line_cap(cairo, cap_style);
@@ -295,9 +295,9 @@
         if ((state & LINE_JOIN) !is 0) {
             int join_style = 0;
             switch (data.lineJoin) {
-                case SWT.JOIN_MITER: join_style = Cairo.CAIRO_LINE_JOIN_MITER; break;
-                case SWT.JOIN_ROUND:  join_style = Cairo.CAIRO_LINE_JOIN_ROUND; break;
-                case SWT.JOIN_BEVEL: join_style = Cairo.CAIRO_LINE_JOIN_BEVEL; break;
+                case DWT.JOIN_MITER: join_style = Cairo.CAIRO_LINE_JOIN_MITER; break;
+                case DWT.JOIN_ROUND:  join_style = Cairo.CAIRO_LINE_JOIN_ROUND; break;
+                case DWT.JOIN_BEVEL: join_style = Cairo.CAIRO_LINE_JOIN_BEVEL; break;
                 default:
             }
             Cairo.cairo_set_line_join(cairo, join_style);
@@ -305,10 +305,10 @@
         if ((state & LINE_WIDTH) !is 0) {
             Cairo.cairo_set_line_width(cairo, data.lineWidth is 0 ? 1 : data.lineWidth);
             switch (data.lineStyle) {
-                case SWT.LINE_DOT:
-                case SWT.LINE_DASH:
-                case SWT.LINE_DASHDOT:
-                case SWT.LINE_DASHDOTDOT:
+                case DWT.LINE_DOT:
+                case DWT.LINE_DASH:
+                case DWT.LINE_DASHDOT:
+                case DWT.LINE_DASHDOTDOT:
                     state |= LINE_STYLE;
                 default:
             }
@@ -318,19 +318,19 @@
             float[] dashes = null;
             float width = data.lineWidth;
             switch (data.lineStyle) {
-                case SWT.LINE_SOLID: break;
-                case SWT.LINE_DASH: dashes = width !is 0 ? LINE_DASH : LINE_DASH_ZERO; break;
-                case SWT.LINE_DOT: dashes = width !is 0 ? LINE_DOT : LINE_DOT_ZERO; break;
-                case SWT.LINE_DASHDOT: dashes = width !is 0 ? LINE_DASHDOT : LINE_DASHDOT_ZERO; break;
-                case SWT.LINE_DASHDOTDOT: dashes = width !is 0 ? LINE_DASHDOTDOT : LINE_DASHDOTDOT_ZERO; break;
-                case SWT.LINE_CUSTOM: dashes = data.lineDashes; break;
+                case DWT.LINE_SOLID: break;
+                case DWT.LINE_DASH: dashes = width !is 0 ? LINE_DASH : LINE_DASH_ZERO; break;
+                case DWT.LINE_DOT: dashes = width !is 0 ? LINE_DOT : LINE_DOT_ZERO; break;
+                case DWT.LINE_DASHDOT: dashes = width !is 0 ? LINE_DASHDOT : LINE_DASHDOT_ZERO; break;
+                case DWT.LINE_DASHDOTDOT: dashes = width !is 0 ? LINE_DASHDOTDOT : LINE_DASHDOTDOT_ZERO; break;
+                case DWT.LINE_CUSTOM: dashes = data.lineDashes; break;
                 default:
             }
             if (dashes !is null) {
                 dashesOffset = data.lineDashesOffset;
                 double[] cairoDashes = new double[dashes.length];
                 for (int i = 0; i < cairoDashes.length; i++) {
-                    cairoDashes[i] = width is 0 || data.lineStyle is SWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
+                    cairoDashes[i] = width is 0 || data.lineStyle is DWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
                 }
                 Cairo.cairo_set_dash(cairo, cairoDashes.ptr, cairoDashes.length, dashesOffset);
             } else {
@@ -386,31 +386,31 @@
         int line_style = 0;
         float[] dashes = null;
         switch (data.lineCap) {
-            case SWT.CAP_ROUND: cap_style = OS.GDK_CAP_ROUND; break;
-            case SWT.CAP_FLAT: cap_style = OS.GDK_CAP_BUTT; break;
-            case SWT.CAP_SQUARE: cap_style = OS.GDK_CAP_PROJECTING; break;
+            case DWT.CAP_ROUND: cap_style = OS.GDK_CAP_ROUND; break;
+            case DWT.CAP_FLAT: cap_style = OS.GDK_CAP_BUTT; break;
+            case DWT.CAP_SQUARE: cap_style = OS.GDK_CAP_PROJECTING; break;
                 default:
         }
         switch (data.lineJoin) {
-            case SWT.JOIN_ROUND: join_style = OS.GDK_JOIN_ROUND; break;
-            case SWT.JOIN_MITER: join_style = OS.GDK_JOIN_MITER; break;
-            case SWT.JOIN_BEVEL: join_style = OS.GDK_JOIN_BEVEL; break;
+            case DWT.JOIN_ROUND: join_style = OS.GDK_JOIN_ROUND; break;
+            case DWT.JOIN_MITER: join_style = OS.GDK_JOIN_MITER; break;
+            case DWT.JOIN_BEVEL: join_style = OS.GDK_JOIN_BEVEL; break;
                 default:
         }
         switch (data.lineStyle) {
-            case SWT.LINE_SOLID: break;
-            case SWT.LINE_DASH: dashes = width !is 0 ? LINE_DASH : LINE_DASH_ZERO; break;
-            case SWT.LINE_DOT: dashes = width !is 0 ? LINE_DOT : LINE_DOT_ZERO; break;
-            case SWT.LINE_DASHDOT: dashes = width !is 0 ? LINE_DASHDOT : LINE_DASHDOT_ZERO; break;
-            case SWT.LINE_DASHDOTDOT: dashes = width !is 0 ? LINE_DASHDOTDOT : LINE_DASHDOTDOT_ZERO; break;
-            case SWT.LINE_CUSTOM: dashes = data.lineDashes; break;
+            case DWT.LINE_SOLID: break;
+            case DWT.LINE_DASH: dashes = width !is 0 ? LINE_DASH : LINE_DASH_ZERO; break;
+            case DWT.LINE_DOT: dashes = width !is 0 ? LINE_DOT : LINE_DOT_ZERO; break;
+            case DWT.LINE_DASHDOT: dashes = width !is 0 ? LINE_DASHDOT : LINE_DASHDOT_ZERO; break;
+            case DWT.LINE_DASHDOTDOT: dashes = width !is 0 ? LINE_DASHDOTDOT : LINE_DASHDOTDOT_ZERO; break;
+            case DWT.LINE_CUSTOM: dashes = data.lineDashes; break;
                 default:
         }
         if (dashes !is null) {
             if ((state & LINE_STYLE) !is 0) {
                 char[] dash_list = new char[dashes.length];
                 for (int i = 0; i < dash_list.length; i++) {
-                    dash_list[i] = cast(char)(width is 0 || data.lineStyle is SWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width);
+                    dash_list[i] = cast(char)(width is 0 || data.lineStyle is DWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width);
                 }
                 OS.gdk_gc_set_dashes(handle, 0, dash_list.ptr, dash_list.length);
             }
@@ -462,7 +462,7 @@
 
 /**
  * Copies a rectangular area of the receiver at the specified
- * position into the image, which must be of type <code>SWT.BITMAP</code>.
+ * position into the image, which must be of type <code>DWT.BITMAP</code>.
  *
  * @param image the image to copy into
  * @param x the x coordinate in the receiver of the area to be copied
@@ -472,17 +472,17 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void copyArea(Image image, int x, int y) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (image is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (image.type !is SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (image.type !is DWT.BITMAP || image.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     Rectangle rect = image.getBounds();
     auto gdkGC = OS.gdk_gc_new(image.pixmap);
-    if (gdkGC is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (gdkGC is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
     OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
     OS.g_object_unref(gdkGC);
@@ -499,7 +499,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -518,14 +518,14 @@
  * @param destY the y coordinate in the receiver of the area to copy to
  * @param paint if <code>true</code> paint events will be generated for old and obscured areas
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void copyArea(int srcX, int srcY, int width, int height, int destX, int destY, bool paint) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (width <= 0 || height <= 0) return;
     int deltaX = destX - srcX, deltaY = destY - srcY;
     if (deltaX is 0 && deltaY is 0) return;
@@ -570,10 +570,10 @@
 
 void createLayout() {
     auto context = OS.gdk_pango_context_get();
-    if (context is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (context is null) DWT.error(DWT.ERROR_NO_HANDLES);
     data.context = context;
     auto layout = OS.pango_layout_new(context);
-    if (layout is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (layout is null) DWT.error(DWT.ERROR_NO_HANDLES);
     data.layout = layout;
     OS.pango_context_set_language(context, OS.gtk_get_default_language());
     OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
@@ -596,7 +596,7 @@
  * the graphics context. Applications must dispose of all GCs
  * which they allocate.
  *
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS if not called from the thread that created the drawable</li>
  * </ul>
  */
@@ -661,12 +661,12 @@
  * @param startAngle the beginning angle
  * @param arcAngle the angular extent of the arc, relative to the start angle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 arcAngle) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     if (width < 0) {
         x = x + width;
@@ -714,14 +714,14 @@
  * @param width the width of the rectangle
  * @param height the height of the rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #drawRectangle(int, int, int, int)
  */
 public void drawFocus(int x, int y, int width, int height) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     /*
     * Feature in GTK.  The function gtk_widget_get_default_style()
     * can't be used here because gtk_paint_focus() uses GCs, which
@@ -761,17 +761,17 @@
  *    <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 SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</li>
  * </ul>
  */
 public void drawImage(Image image, int x, int y) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (image is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (image.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     drawImage(image, 0, 0, -1, -1, x, y, -1, -1, true);
 }
 
@@ -800,21 +800,21 @@
  *    <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 SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES - if no handles are available to perform the operation</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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (srcWidth is 0 || srcHeight is 0 || destWidth is 0 || destHeight is 0) return;
     if (srcX < 0 || srcY < 0 || srcWidth < 0 || srcHeight < 0 || destWidth < 0 || destHeight < 0) {
-        SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     }
-    if (image is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (image.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     drawImage(image, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, false);
 }
 
@@ -832,7 +832,7 @@
             srcWidth is destWidth && destWidth is imgWidth &&
             srcHeight is destHeight && destHeight is imgHeight;
         if (srcX + srcWidth > imgWidth || srcY + srcHeight > imgHeight) {
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         }
     }
     auto cairo = data.cairo;
@@ -848,14 +848,14 @@
             }
             int filter = Cairo.CAIRO_FILTER_GOOD;
             switch (data.interpolation) {
-                case SWT.DEFAULT: filter = Cairo.CAIRO_FILTER_GOOD; break;
-                case SWT.NONE: filter = Cairo.CAIRO_FILTER_NEAREST; break;
-                case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
-                case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
+                case DWT.DEFAULT: filter = Cairo.CAIRO_FILTER_GOOD; break;
+                case DWT.NONE: filter = Cairo.CAIRO_FILTER_NEAREST; break;
+                case DWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
+                case DWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
                 default:
             }
             auto pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);
-            if (pattern is null) SWT.error(SWT.ERROR_NO_HANDLES);
+            if (pattern is null) DWT.error(DWT.ERROR_NO_HANDLES);
             if (srcWidth !is destWidth || srcHeight !is destHeight) {
                 /*
                 * Bug in Cairo.  When drawing the image streched with an interpolation
@@ -899,7 +899,7 @@
                     Cairo.cairo_destroy(cr);
                     auto newPattern = Cairo.cairo_pattern_create_for_surface(surface);
                     Cairo.cairo_surface_destroy(surface);
-                    if (newPattern is null) SWT.error(SWT.ERROR_NO_HANDLES);
+                    if (newPattern is null) DWT.error(DWT.ERROR_NO_HANDLES);
                     Cairo.cairo_pattern_destroy(pattern);
                     pattern = newPattern;
                     Cairo.cairo_pattern_set_extend(pattern, Cairo.CAIRO_EXTEND_PAD);
@@ -1105,13 +1105,13 @@
             attrib.repeat = true;
         }
         maskPict = OS.XRenderCreatePicture(cast(void*)xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(cast(void*)xDisplay, maskType), attribCount, attrib);
-        if (maskPict is 0) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (maskPict is 0) DWT.error(DWT.ERROR_NO_HANDLES);
     }
     auto format = OS.XRenderFindVisualFormat(cast(void*)xDisplay, OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()));
     auto destPict = OS.XRenderCreatePicture(cast(void*)xDisplay, OS.gdk_x11_drawable_get_xid(drawable), format, 0, null);
-    if (destPict is 0) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (destPict is 0) DWT.error(DWT.ERROR_NO_HANDLES);
     int srcPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(srcImage.pixmap), format, 0, null);
-    if (srcPict is 0) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (srcPict is 0) DWT.error(DWT.ERROR_NO_HANDLES);
     if (srcWidth !is destWidth || srcHeight !is destHeight) {
         int[] transform = [cast(int)((cast(float)srcWidth / destWidth) * 65536), 0, 0, 0, cast(int)((cast(float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536];
         OS.XRenderSetPictureTransform(xDisplay, srcPict, cast(XTransform*)transform.ptr);
@@ -1173,12 +1173,12 @@
  * @param x2 the second point's x coordinate
  * @param y2 the second point's y coordinate
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -1208,12 +1208,12 @@
  * @param width the width of the oval to be drawn
  * @param height the height of the oval to be drawn
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     if (width < 0) {
         x = x + width;
@@ -1255,7 +1255,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -1265,9 +1265,9 @@
  * @since 3.1
  */
 public void drawPath(Path path) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (path is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (path.handle is null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (path is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (path.handle is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     initCairo();
     checkGC(DRAW);
     auto cairo = data.cairo;
@@ -1275,7 +1275,7 @@
     double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
     Cairo.cairo_translate(cairo, xOffset, yOffset);
     auto copy = Cairo.cairo_copy_path(path.handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_append_path(cairo, copy);
     Cairo.cairo_path_destroy(copy);
     Cairo.cairo_stroke(cairo);
@@ -1293,14 +1293,14 @@
  * @param x the point's x coordinate
  * @param y the point's y coordinate
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void drawPoint (int x, int y) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -1324,13 +1324,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawPolygon(int[] pointArray) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     checkGC(DRAW);
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -1354,13 +1354,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point array is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawPolyline(int[] pointArray) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     checkGC(DRAW);
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -1393,12 +1393,12 @@
  * @param width the width of the rectangle to be drawn
  * @param height the height of the rectangle to be drawn
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     if (width < 0) {
         x = x + width;
@@ -1430,12 +1430,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawRectangle(Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     drawRectangle (rect.x, rect.y, rect.width, rect.height);
 }
 /**
@@ -1455,12 +1455,12 @@
  * @param arcWidth the width of the arc
  * @param arcHeight the height of the arc
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(DRAW);
     int nx = x;
     int ny = y;
@@ -1543,7 +1543,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1566,12 +1566,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawString(char[] str, int x, int y, bool isTransparent) {
-    drawText(str, x, y, isTransparent ? SWT.DRAW_TRANSPARENT : 0);
+    drawText(str, x, y, isTransparent ? DWT.DRAW_TRANSPARENT : 0);
 }
 
 /**
@@ -1588,12 +1588,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawText(char[] str, int x, int y) {
-    drawText(str, x, y, SWT.DRAW_DELIMITER | SWT.DRAW_TAB);
+    drawText(str, x, y, DWT.DRAW_DELIMITER | DWT.DRAW_TAB);
 }
 
 /**
@@ -1612,13 +1612,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawText(char[] str, int x, int y, bool isTransparent) {
-    int flags = SWT.DRAW_DELIMITER | SWT.DRAW_TAB;
-    if (isTransparent) flags |= SWT.DRAW_TRANSPARENT;
+    int flags = DWT.DRAW_DELIMITER | DWT.DRAW_TAB;
+    if (isTransparent) flags |= DWT.DRAW_TRANSPARENT;
     drawText(str, x, y, flags);
 }
 
@@ -1652,13 +1652,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void drawText (char[] str, int x, int y, int flags) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (str is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (str is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (str.length is 0) return;
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -1677,7 +1677,7 @@
     }
     setString(str, flags);
     if (cairo !is null) {
-        if ((flags & SWT.DRAW_TRANSPARENT) is 0) {
+        if ((flags & DWT.DRAW_TRANSPARENT) is 0) {
             checkGC(BACKGROUND);
             int width, height;
             OS.pango_layout_get_size(data.layout, &width, &height);
@@ -1691,7 +1691,7 @@
     }
     checkGC(FOREGROUND | FONT | BACKGROUND_BG);
     GdkColor* background = null;
-    if ((flags & SWT.DRAW_TRANSPARENT) is 0) background = data.background;
+    if ((flags & DWT.DRAW_TRANSPARENT) is 0) background = data.background;
     if (!data.xorMode) {
         OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
     } else {
@@ -1701,9 +1701,9 @@
         int width = OS.PANGO_PIXELS(w);
         int height = OS.PANGO_PIXELS(h);
         auto pixmap = OS.gdk_pixmap_new(cast(GdkDrawable*)OS.GDK_ROOT_PARENT(), width, height, -1);
-        if (pixmap is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (pixmap is null) DWT.error(DWT.ERROR_NO_HANDLES);
         auto gdkGC = OS.gdk_gc_new(cast(GdkDrawable*)pixmap);
-        if (gdkGC is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (gdkGC is null) DWT.error(DWT.ERROR_NO_HANDLES);
         GdkColor* black = new GdkColor();
         OS.gdk_gc_set_foreground(gdkGC, black);
         OS.gdk_draw_rectangle(cast(GdkDrawable*)pixmap, gdkGC, 1, 0, 0, width, height);
@@ -1760,14 +1760,14 @@
  * @param startAngle the beginning angle
  * @param arcAngle the angular extent of the arc, relative to the start angle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 arcAngle) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(FILL);
     if (width < 0) {
         x = x + width;
@@ -1819,14 +1819,14 @@
  * @param vertical if true sweeps from top to bottom, else
  *        sweeps from left to right
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #drawRectangle(int, int, int, int)
  */
 public void fillGradientRectangle(int x, int y, int width, int height, bool vertical) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if ((width is 0) || (height is 0)) return;
 
     /* Rewrite this to use GdkPixbuf */
@@ -1890,14 +1890,14 @@
  * @param width the width of the oval to be filled
  * @param height the height of the oval to be filled
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(FILL);
     if (width < 0) {
         x = x + width;
@@ -1938,7 +1938,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -1948,14 +1948,14 @@
  * @since 3.1
  */
 public void fillPath (Path path) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (path is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (path.handle is null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (path is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (path.handle is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     initCairo();
     checkGC(FILL);
     auto cairo = data.cairo;
     auto copy = Cairo.cairo_copy_path(path.handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_append_path(cairo, copy);
     Cairo.cairo_path_destroy(copy);
     Cairo.cairo_fill(cairo);
@@ -1974,15 +1974,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #drawPolygon
  */
 public void fillPolygon(int[] pointArray) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     checkGC(FILL);
     auto cairo = data.cairo;
     if (cairo !is null) {
@@ -2002,14 +2002,14 @@
  * @param width the width of the rectangle to be filled
  * @param height the height of the rectangle to be filled
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #drawRectangle(int, int, int, int)
  */
 public void fillRectangle(int x, int y, int width, int height) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(FILL);
     if (width < 0) {
         x = x + width;
@@ -2037,15 +2037,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #drawRectangle(int, int, int, int)
  */
 public void fillRectangle(Rectangle rect) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     fillRectangle(rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -2060,14 +2060,14 @@
  * @param arcWidth the width of the arc
  * @param arcHeight the height of the arc
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     checkGC(FILL);
     int nx = x;
     int ny = y;
@@ -2158,12 +2158,12 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getAdvanceWidth(char ch) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     //BOGUS
     return stringExtent([ch]).x;
 }
@@ -2185,7 +2185,7 @@
  *
  * @return the advanced value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2194,7 +2194,7 @@
  * @since 3.1
  */
 public bool getAdvanced() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.cairo !is null;
 }
 
@@ -2203,26 +2203,26 @@
  *
  * @return the alpha value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int getAlpha() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.alpha;
 }
 
 /**
  * Returns the receiver's anti-aliasing setting value, which will be
- * one of <code>SWT.DEFAULT</code>, <code>SWT.OFF</code> or
- * <code>SWT.ON</code>. Note that this controls anti-aliasing for all
+ * one of <code>DWT.DEFAULT</code>, <code>DWT.OFF</code> or
+ * <code>DWT.ON</code>. Note that this controls anti-aliasing for all
  * <em>non-text drawing</em> operations.
  *
  * @return the anti-aliasing setting
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2231,17 +2231,17 @@
  * @since 3.1
  */
 public int getAntialias() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (data.cairo is null) return SWT.DEFAULT;
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (data.cairo is null) return DWT.DEFAULT;
     int antialias = Cairo.cairo_get_antialias(data.cairo);
     switch (antialias) {
-        case Cairo.CAIRO_ANTIALIAS_DEFAULT: return SWT.DEFAULT;
-        case Cairo.CAIRO_ANTIALIAS_NONE: return SWT.OFF;
+        case Cairo.CAIRO_ANTIALIAS_DEFAULT: return DWT.DEFAULT;
+        case Cairo.CAIRO_ANTIALIAS_NONE: return DWT.OFF;
         case Cairo.CAIRO_ANTIALIAS_GRAY:
-        case Cairo.CAIRO_ANTIALIAS_SUBPIXEL: return SWT.ON;
+        case Cairo.CAIRO_ANTIALIAS_SUBPIXEL: return DWT.ON;
                 default:
     }
-    return SWT.DEFAULT;
+    return DWT.DEFAULT;
 }
 
 /**
@@ -2249,12 +2249,12 @@
  *
  * @return the receiver's background color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Color getBackground() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return Color.gtk_new(data.device, data.background);
 }
 
@@ -2264,7 +2264,7 @@
  *
  * @return the receiver's background pattern
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2273,7 +2273,7 @@
  * @since 3.1
  */
 public Pattern getBackgroundPattern() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.backgroundPattern;
 }
 
@@ -2289,12 +2289,12 @@
  * @param ch the character to measure
  * @return the width of the character
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getCharWidth(char ch) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     //BOGUS
     return stringExtent([ch]).x;
 }
@@ -2307,12 +2307,12 @@
  *
  * @return the bounding rectangle of the clipping region
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Rectangle getClipping() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     /* Calculate visible bounds in device space */
     int x = 0, y = 0, width = 0, height = 0;
     int w, h;
@@ -2372,14 +2372,14 @@
  *    <li>ERROR_NULL_ARGUMENT - if the region is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the region is disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void getClipping(Region region) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (region is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (region is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     auto clipping = region.handle;
     OS.gdk_region_subtract(clipping, clipping);
     auto cairo = data.cairo;
@@ -2418,21 +2418,21 @@
 
 /**
  * Returns the receiver's fill rule, which will be one of
- * <code>SWT.FILL_EVEN_ODD</code> or <code>SWT.FILL_WINDING</code>.
+ * <code>DWT.FILL_EVEN_ODD</code> or <code>DWT.FILL_WINDING</code>.
  *
  * @return the receiver's fill rule
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int getFillRule() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     auto cairo = data.cairo;
-    if (cairo is null) return SWT.FILL_EVEN_ODD;
-    return Cairo.cairo_get_fill_rule(cairo) is Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
+    if (cairo is null) return DWT.FILL_EVEN_ODD;
+    return Cairo.cairo_get_fill_rule(cairo) is Cairo.CAIRO_FILL_RULE_WINDING ? DWT.FILL_WINDING : DWT.FILL_EVEN_ODD;
 }
 
 /**
@@ -2441,12 +2441,12 @@
  *
  * @return the receiver's font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Font getFont() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return Font.gtk_new(data.device, data.font);
 }
 
@@ -2457,12 +2457,12 @@
  *
  * @return font metrics for the receiver's font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public FontMetrics getFontMetrics() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.context is null) createLayout();
     checkGC(FONT);
     auto context = data.context;
@@ -2482,12 +2482,12 @@
  *
  * @return the color used for drawing foreground things
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Color getForeground() {
-    if (handle is null) SWT.error(SWT.ERROR_WIDGET_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_WIDGET_DISPOSED);
     return Color.gtk_new(data.device, data.foreground);
 }
 
@@ -2497,7 +2497,7 @@
  *
  * @return the receiver's foreground pattern
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2506,7 +2506,7 @@
  * @since 3.1
  */
 public Pattern getForegroundPattern() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.foregroundPattern;
 }
 
@@ -2515,14 +2515,14 @@
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>GC</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is not
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
  *
  * @return the receiver's GCData
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2531,25 +2531,25 @@
  * @since 3.2
  */
 public GCData getGCData() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data;
 }
 
 /**
  * Returns the receiver's interpolation setting, which will be one of
- * <code>SWT.DEFAULT</code>, <code>SWT.NONE</code>,
- * <code>SWT.LOW</code> or <code>SWT.HIGH</code>.
+ * <code>DWT.DEFAULT</code>, <code>DWT.NONE</code>,
+ * <code>DWT.LOW</code> or <code>DWT.HIGH</code>.
  *
  * @return the receiver's interpolation setting
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int getInterpolation() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.interpolation;
 }
 
@@ -2558,14 +2558,14 @@
  *
  * @return the line attributes used for drawing lines
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.3
  */
 public LineAttributes getLineAttributes() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     float[] dashes = null;
     if (data.lineDashes !is null) {
         dashes = new float[data.lineDashes.length];
@@ -2576,19 +2576,19 @@
 
 /**
  * Returns the receiver's line cap style, which will be one
- * of the constants <code>SWT.CAP_FLAT</code>, <code>SWT.CAP_ROUND</code>,
- * or <code>SWT.CAP_SQUARE</code>.
+ * of the constants <code>DWT.CAP_FLAT</code>, <code>DWT.CAP_ROUND</code>,
+ * or <code>DWT.CAP_SQUARE</code>.
  *
  * @return the cap style used for drawing lines
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int getLineCap() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.lineCap;
 }
 
@@ -2598,14 +2598,14 @@
  *
  * @return the line dash style used for drawing lines
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int[] getLineDash() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.lineDashes is null) return null;
     int[] lineDashes = new int[data.lineDashes.length];
     for (int i = 0; i < lineDashes.length; i++) {
@@ -2616,36 +2616,36 @@
 
 /**
  * Returns the receiver's line join style, which will be one
- * of the constants <code>SWT.JOIN_MITER</code>, <code>SWT.JOIN_ROUND</code>,
- * or <code>SWT.JOIN_BEVEL</code>.
+ * of the constants <code>DWT.JOIN_MITER</code>, <code>DWT.JOIN_ROUND</code>,
+ * or <code>DWT.JOIN_BEVEL</code>.
  *
  * @return the join style used for drawing lines
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public int getLineJoin() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.lineJoin;
 }
 
 /**
  * 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>.
+ * of the constants <code>DWT.LINE_SOLID</code>, <code>DWT.LINE_DASH</code>,
+ * <code>DWT.LINE_DOT</code>, <code>DWT.LINE_DASHDOT</code> or
+ * <code>DWT.LINE_DASHDOTDOT</code>.
  *
  * @return the style used for drawing lines
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getLineStyle() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.lineStyle;
 }
 
@@ -2657,12 +2657,12 @@
  *
  * @return the receiver's line width
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getLineWidth() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return cast(int)data.lineWidth;
 }
 
@@ -2678,26 +2678,26 @@
  *
  * @return the style bits
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 2.1.2
  */
 public int getStyle () {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.style;
 }
 
 /**
  * Returns the receiver's text drawing anti-aliasing setting value,
- * which will be one of <code>SWT.DEFAULT</code>, <code>SWT.OFF</code> or
- * <code>SWT.ON</code>. Note that this controls anti-aliasing
+ * which will be one of <code>DWT.DEFAULT</code>, <code>DWT.OFF</code> or
+ * <code>DWT.ON</code>. Note that this controls anti-aliasing
  * <em>only</em> for text drawing operations.
  *
  * @return the anti-aliasing setting
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2706,8 +2706,8 @@
  * @since 3.1
  */
 public int getTextAntialias() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (data.cairo is null) return SWT.DEFAULT;
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (data.cairo is null) return DWT.DEFAULT;
     int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;
     if (OS.GTK_VERSION < OS.buildVERSION(2, 8, 0)) {
         auto options = Cairo.cairo_font_options_create();
@@ -2721,13 +2721,13 @@
         }
     }
     switch (antialias) {
-        case Cairo.CAIRO_ANTIALIAS_DEFAULT: return SWT.DEFAULT;
-        case Cairo.CAIRO_ANTIALIAS_NONE: return SWT.OFF;
+        case Cairo.CAIRO_ANTIALIAS_DEFAULT: return DWT.DEFAULT;
+        case Cairo.CAIRO_ANTIALIAS_NONE: return DWT.OFF;
         case Cairo.CAIRO_ANTIALIAS_GRAY:
-        case Cairo.CAIRO_ANTIALIAS_SUBPIXEL: return SWT.ON;
+        case Cairo.CAIRO_ANTIALIAS_SUBPIXEL: return DWT.ON;
                 default:
     }
-    return SWT.DEFAULT;
+    return DWT.DEFAULT;
 }
 
 /**
@@ -2740,7 +2740,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2749,9 +2749,9 @@
  * @since 3.1
  */
 public void getTransform(Transform transform) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (transform is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (transform is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (transform.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     auto cairo = data.cairo;
     if (cairo !is null) {
         Cairo.cairo_get_matrix(cairo, cast(cairo_matrix_t*)transform.handle.ptr);
@@ -2770,12 +2770,12 @@
  *
  * @return <code>true</code> true if the receiver is in XOR mode, and false otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool getXORMode() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.xorMode;
 }
 
@@ -2787,7 +2787,7 @@
  *
  * @return the receiver's hash
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2840,11 +2840,11 @@
     OS.gdk_drawable_get_size(drawable, &w, &h);
     int width = w, height = h;
     auto surface = Cairo.cairo_xlib_surface_create(cast(void*)xDisplay, xDrawable, xVisual, width, height);
-    if (surface is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (surface is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
     data.cairo = cairo = Cairo.cairo_create(surface);
     Cairo.cairo_surface_destroy(surface);
-    if (cairo is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (cairo is null) DWT.error(DWT.ERROR_NO_HANDLES);
     data.disposeCairo = true;
     Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
     data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET);
@@ -2861,12 +2861,12 @@
  *
  * @return <code>true</code> if the GC has a clipping region, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool isClipped() {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return data.clipRgn !is null;
 }
 
@@ -2914,7 +2914,7 @@
  *
  * @param advanced the new advanced graphics state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2932,18 +2932,18 @@
  * @since 3.1
  */
 public void setAdvanced(bool advanced) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (advanced && data.cairo !is null) return;
     if (advanced) {
         try {
             initCairo();
-        } catch (SWTException e) {}
+        } catch (DWTException e) {}
     } else {
         if (!data.disposeCairo) return;
         auto cairo = data.cairo;
         if (cairo !is null) Cairo.cairo_destroy(cairo);
         data.cairo = null;
-        data.interpolation = SWT.DEFAULT;
+        data.interpolation = DWT.DEFAULT;
         data.backgroundPattern = data.foregroundPattern = null;
         data.state = 0;
         setClipping(cast(GdkRegion*)null);
@@ -2959,7 +2959,7 @@
  * </p>
  * @param alpha the alpha value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -2970,7 +2970,7 @@
  * @since 3.1
  */
 public void setAlpha(int alpha) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.cairo is null && (alpha & 0xff) is 0xff) return;
     initCairo();
     data.alpha = alpha & 0xff;
@@ -2979,8 +2979,8 @@
 
 /**
  * Sets the receiver's anti-aliasing value to the parameter,
- * which must be one of <code>SWT.DEFAULT</code>, <code>SWT.OFF</code>
- * or <code>SWT.ON</code>. Note that this controls anti-aliasing for all
+ * which must be one of <code>DWT.DEFAULT</code>, <code>DWT.OFF</code>
+ * or <code>DWT.ON</code>. Note that this controls anti-aliasing for all
  * <em>non-text drawing</em> operations.
  * <p>
  * This operation requires the operating system's advanced
@@ -2991,10 +2991,10 @@
  * @param antialias the anti-aliasing setting
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the parameter is not one of <code>SWT.DEFAULT</code>,
- *                                 <code>SWT.OFF</code> or <code>SWT.ON</code></li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the parameter is not one of <code>DWT.DEFAULT</code>,
+ *                                 <code>DWT.OFF</code> or <code>DWT.ON</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3006,16 +3006,16 @@
  * @since 3.1
  */
 public void setAntialias(int antialias) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (data.cairo is null && antialias is SWT.DEFAULT) return;
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (data.cairo is null && antialias is DWT.DEFAULT) return;
     int mode = 0;
     switch (antialias) {
-        case SWT.DEFAULT: mode = Cairo.CAIRO_ANTIALIAS_DEFAULT; break;
-        case SWT.OFF: mode = Cairo.CAIRO_ANTIALIAS_NONE; break;
-        case SWT.ON: mode = Cairo.CAIRO_ANTIALIAS_GRAY;
+        case DWT.DEFAULT: mode = Cairo.CAIRO_ANTIALIAS_DEFAULT; break;
+        case DWT.OFF: mode = Cairo.CAIRO_ANTIALIAS_NONE; break;
+        case DWT.ON: mode = Cairo.CAIRO_ANTIALIAS_GRAY;
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     initCairo();
     auto cairo = data.cairo;
@@ -3033,14 +3033,14 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setBackground(Color color) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (color is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (color is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     data.background = color.handle;
     data.backgroundPattern = null;
     data.state &= ~(BACKGROUND | BACKGROUND_BG);
@@ -3059,7 +3059,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3071,8 +3071,8 @@
  * @since 3.1
  */
 public void setBackgroundPattern(Pattern pattern) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pattern !is null && pattern.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pattern !is null && pattern.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (data.cairo is null && pattern is null) return;
     initCairo();
     if (data.backgroundPattern is pattern) return;
@@ -3174,12 +3174,12 @@
  * @param width the width of the clipping rectangle
  * @param height the height of the clipping rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (width < 0) {
         x = x + width;
         width = -width;
@@ -3214,7 +3214,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the path has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3226,14 +3226,14 @@
  * @since 3.1
  */
 public void setClipping(Path path) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (path !is null && path.isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (path !is null && path.isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     setClipping(cast(GdkRegion*)null);
     if (path !is null) {
         initCairo();
         auto cairo = data.cairo;
         auto copy = Cairo.cairo_copy_path(path.handle);
-        if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
         Cairo.cairo_append_path(cairo, copy);
         Cairo.cairo_path_destroy(copy);
         Cairo.cairo_clip(cairo);
@@ -3249,12 +3249,12 @@
  *
  * @param rect the clipping rectangle or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setClipping(Rectangle rect) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (rect is null) {
         setClipping(cast(GdkRegion*)null);
     } else {
@@ -3273,13 +3273,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the region has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setClipping(Region region) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (region !is null && region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (region !is null && region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     setClipping(region !is null ? region.handle : cast(GdkRegion*)null);
 }
 
@@ -3294,14 +3294,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setFont(Font font) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (font is null) font = data.device.systemFont;
-    if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     data.font = font.handle;
     data.state &= ~FONT;
     data.stringWidth = data.stringHeight = -1;
@@ -3309,30 +3309,30 @@
 
 /**
  * Sets the receiver's fill rule to the parameter, which must be one of
- * <code>SWT.FILL_EVEN_ODD</code> or <code>SWT.FILL_WINDING</code>.
+ * <code>DWT.FILL_EVEN_ODD</code> or <code>DWT.FILL_WINDING</code>.
  *
  * @param rule the new fill rule
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the rule is not one of <code>SWT.FILL_EVEN_ODD</code>
- *                                 or <code>SWT.FILL_WINDING</code></li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the rule is not one of <code>DWT.FILL_EVEN_ODD</code>
+ *                                 or <code>DWT.FILL_WINDING</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void setFillRule(int rule) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     int cairo_mode = Cairo.CAIRO_FILL_RULE_EVEN_ODD;
     switch (rule) {
-        case SWT.FILL_WINDING:
+        case DWT.FILL_WINDING:
             cairo_mode = Cairo.CAIRO_FILL_RULE_WINDING; break;
-        case SWT.FILL_EVEN_ODD:
+        case DWT.FILL_EVEN_ODD:
             cairo_mode = Cairo.CAIRO_FILL_RULE_EVEN_ODD; break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     //TODO - need fill rule in X, GDK has no API
     initCairo();
@@ -3352,14 +3352,14 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setForeground(Color color) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (color is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (color is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     data.foreground = color.handle;
     data.foregroundPattern = null;
     data.state &= ~FOREGROUND;
@@ -3377,7 +3377,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3389,8 +3389,8 @@
  * @since 3.1
  */
 public void setForegroundPattern(Pattern pattern) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pattern !is null && pattern.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pattern !is null && pattern.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (data.cairo is null && pattern is null) return;
     initCairo();
     if (data.foregroundPattern is pattern) return;
@@ -3400,8 +3400,8 @@
 
 /**
  * Sets the receiver's interpolation setting to the parameter, which
- * must be one of <code>SWT.DEFAULT</code>, <code>SWT.NONE</code>,
- * <code>SWT.LOW</code> or <code>SWT.HIGH</code>.
+ * must be one of <code>DWT.DEFAULT</code>, <code>DWT.NONE</code>,
+ * <code>DWT.LOW</code> or <code>DWT.HIGH</code>.
  * <p>
  * This operation requires the operating system's advanced
  * graphics subsystem which may not be available on some
@@ -3411,10 +3411,10 @@
  * @param interpolation the new interpolation setting
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the rule is not one of <code>SWT.DEFAULT</code>,
- *                                 <code>SWT.NONE</code>, <code>SWT.LOW</code> or <code>SWT.HIGH</code>
+ *    <li>ERROR_INVALID_ARGUMENT - if the rule is not one of <code>DWT.DEFAULT</code>,
+ *                                 <code>DWT.NONE</code>, <code>DWT.LOW</code> or <code>DWT.HIGH</code>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3425,16 +3425,16 @@
  * @since 3.1
  */
 public void setInterpolation(int interpolation) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (data.cairo is null && interpolation is SWT.DEFAULT) return;
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (data.cairo is null && interpolation is DWT.DEFAULT) return;
     switch (interpolation) {
-        case SWT.DEFAULT:
-        case SWT.NONE:
-        case SWT.LOW:
-        case SWT.HIGH:
+        case DWT.DEFAULT:
+        case DWT.NONE:
+        case DWT.LOW:
+        case DWT.HIGH:
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     initCairo();
     data.interpolation = interpolation;
@@ -3453,7 +3453,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the attributes is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if any of the line attributes is not valid</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3465,8 +3465,8 @@
  * @since 3.3
  */
 public void setLineAttributes(LineAttributes attributes) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (attributes is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (attributes is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     int mask = 0;
     float lineWidth = attributes.width;
     if (lineWidth !is data.lineWidth) {
@@ -3476,41 +3476,41 @@
     if (lineStyle !is data.lineStyle) {
         mask |= LINE_STYLE;
         switch (lineStyle) {
-            case SWT.LINE_SOLID:
-            case SWT.LINE_DASH:
-            case SWT.LINE_DOT:
-            case SWT.LINE_DASHDOT:
-            case SWT.LINE_DASHDOTDOT:
+            case DWT.LINE_SOLID:
+            case DWT.LINE_DASH:
+            case DWT.LINE_DOT:
+            case DWT.LINE_DASHDOT:
+            case DWT.LINE_DASHDOTDOT:
                 break;
-            case SWT.LINE_CUSTOM:
-                if (attributes.dash is null) lineStyle = SWT.LINE_SOLID;
+            case DWT.LINE_CUSTOM:
+                if (attributes.dash is null) lineStyle = DWT.LINE_SOLID;
                 break;
             default:
-                SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+                DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         }
     }
     int join = attributes.join;
     if (join !is data.lineJoin) {
         mask |= LINE_JOIN;
         switch (join) {
-            case SWT.CAP_ROUND:
-            case SWT.CAP_FLAT:
-            case SWT.CAP_SQUARE:
+            case DWT.CAP_ROUND:
+            case DWT.CAP_FLAT:
+            case DWT.CAP_SQUARE:
                 break;
             default:
-                SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+                DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         }
     }
     int cap = attributes.join;
     if (cap !is data.lineCap) {
         mask |= LINE_CAP;
         switch (cap) {
-            case SWT.JOIN_MITER:
-            case SWT.JOIN_ROUND:
-            case SWT.JOIN_BEVEL:
+            case DWT.JOIN_MITER:
+            case DWT.JOIN_ROUND:
+            case DWT.JOIN_BEVEL:
                 break;
             default:
-                SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+                DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         }
     }
     float[] dashes = attributes.dash;
@@ -3519,7 +3519,7 @@
         bool changed = lineDashes is null || lineDashes.length !is dashes.length;
         for (int i = 0; i < dashes.length; i++) {
             float dash = dashes[i];
-            if (dash <= 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            if (dash <= 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
             if (!changed && lineDashes[i] !is dash) changed = true;
         }
         if (changed) {
@@ -3559,30 +3559,30 @@
 
 /**
  * Sets the receiver's line cap style to the argument, which must be one
- * of the constants <code>SWT.CAP_FLAT</code>, <code>SWT.CAP_ROUND</code>,
- * or <code>SWT.CAP_SQUARE</code>.
+ * of the constants <code>DWT.CAP_FLAT</code>, <code>DWT.CAP_ROUND</code>,
+ * or <code>DWT.CAP_SQUARE</code>.
  *
  * @param cap the cap style to be used for drawing lines
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the style is not valid</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void setLineCap(int cap) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.lineCap is cap) return;
     switch (cap) {
-        case SWT.CAP_ROUND:
-        case SWT.CAP_FLAT:
-        case SWT.CAP_SQUARE:
+        case DWT.CAP_ROUND:
+        case DWT.CAP_FLAT:
+        case DWT.CAP_SQUARE:
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     data.lineCap = cap;
     data.state &= ~LINE_CAP;
@@ -3591,28 +3591,28 @@
 /**
  * Sets the receiver's line dash style to the argument. The default
  * value is <code>null</code>. If the argument is not <code>null</code>,
- * the receiver's line style is set to <code>SWT.LINE_CUSTOM</code>, otherwise
- * it is set to <code>SWT.LINE_SOLID</code>.
+ * the receiver's line style is set to <code>DWT.LINE_CUSTOM</code>, otherwise
+ * it is set to <code>DWT.LINE_SOLID</code>.
  *
  * @param dashes the dash style to be used for drawing lines
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if any of the values in the array is less than or equal 0</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void setLineDash(int[] dashes) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     float[] lineDashes = data.lineDashes;
     if (dashes !is null && dashes.length > 0) {
-        bool changed = data.lineStyle !is SWT.LINE_CUSTOM || lineDashes is null || lineDashes.length !is dashes.length;
+        bool changed = data.lineStyle !is DWT.LINE_CUSTOM || lineDashes is null || lineDashes.length !is dashes.length;
         for (int i = 0; i < dashes.length; i++) {
             int dash = dashes[i];
-            if (dash <= 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            if (dash <= 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
             if (!changed && lineDashes[i] !is dash) changed = true;
         }
         if (!changed) return;
@@ -3620,41 +3620,41 @@
         for (int i = 0; i < dashes.length; i++) {
             data.lineDashes[i] = dashes[i];
         }
-        data.lineStyle = SWT.LINE_CUSTOM;
+        data.lineStyle = DWT.LINE_CUSTOM;
     } else {
-        if (data.lineStyle is SWT.LINE_SOLID && (lineDashes is null || lineDashes.length is 0)) return;
+        if (data.lineStyle is DWT.LINE_SOLID && (lineDashes is null || lineDashes.length is 0)) return;
         data.lineDashes = null;
-        data.lineStyle = SWT.LINE_SOLID;
+        data.lineStyle = DWT.LINE_SOLID;
     }
     data.state &= ~LINE_STYLE;
 }
 
 /**
  * Sets the receiver's line join style to the argument, which must be one
- * of the constants <code>SWT.JOIN_MITER</code>, <code>SWT.JOIN_ROUND</code>,
- * or <code>SWT.JOIN_BEVEL</code>.
+ * of the constants <code>DWT.JOIN_MITER</code>, <code>DWT.JOIN_ROUND</code>,
+ * or <code>DWT.JOIN_BEVEL</code>.
  *
  * @param join the join style to be used for drawing lines
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the style is not valid</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void setLineJoin(int join) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.lineJoin is join) return;
     switch (join) {
-        case SWT.JOIN_MITER:
-        case SWT.JOIN_ROUND:
-        case SWT.JOIN_BEVEL:
+        case DWT.JOIN_MITER:
+        case DWT.JOIN_ROUND:
+        case DWT.JOIN_BEVEL:
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     data.lineJoin = join;
     data.state &= ~LINE_JOIN;
@@ -3662,34 +3662,34 @@
 
 /**
  * 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>.
+ * of the constants <code>DWT.LINE_SOLID</code>, <code>DWT.LINE_DASH</code>,
+ * <code>DWT.LINE_DOT</code>, <code>DWT.LINE_DASHDOT</code> or
+ * <code>DWT.LINE_DASHDOTDOT</code>.
  *
  * @param lineStyle the style to be used for drawing lines
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the style is not valid</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setLineStyle(int lineStyle) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.lineStyle is lineStyle) return;
     switch (lineStyle) {
-        case SWT.LINE_SOLID:
-        case SWT.LINE_DASH:
-        case SWT.LINE_DOT:
-        case SWT.LINE_DASHDOT:
-        case SWT.LINE_DASHDOTDOT:
+        case DWT.LINE_SOLID:
+        case DWT.LINE_DASH:
+        case DWT.LINE_DOT:
+        case DWT.LINE_DASHDOT:
+        case DWT.LINE_DASHDOTDOT:
             break;
-        case SWT.LINE_CUSTOM:
-            if (data.lineDashes is null) lineStyle = SWT.LINE_SOLID;
+        case DWT.LINE_CUSTOM:
+            if (data.lineDashes is null) lineStyle = DWT.LINE_SOLID;
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     data.lineStyle = lineStyle;
     data.state &= ~LINE_STYLE;
@@ -3709,12 +3709,12 @@
  *
  * @param lineWidth the width of a line
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setLineWidth(int lineWidth) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (data.lineWidth is lineWidth) return;
     data.lineWidth = lineWidth;
     data.state &= ~(LINE_WIDTH | DRAW_OFFSET);
@@ -3722,14 +3722,14 @@
 
 void setString(char[] str, int flags) {
     if (data.layout is null) createLayout();
-    if (str is data.str && (flags & ~SWT.DRAW_TRANSPARENT) is (data.drawFlags  & ~SWT.DRAW_TRANSPARENT)) {
+    if (str is data.str && (flags & ~DWT.DRAW_TRANSPARENT) is (data.drawFlags  & ~DWT.DRAW_TRANSPARENT)) {
         return;
     }
     char[] buffer;
     int mnemonic, len = str.length ;
     auto layout = data.layout;
     char[] text = str.dup;
-    if ((flags & SWT.DRAW_MNEMONIC) !is 0 && (mnemonic = fixMnemonic(text)) !is -1) {
+    if ((flags & DWT.DRAW_MNEMONIC) !is 0 && (mnemonic = fixMnemonic(text)) !is -1) {
         char[] text1 = new char[mnemonic - 1];
         System.arraycopy(text, 0, text1, 0, text1.length);
         char[] buffer1 = text1.dup;
@@ -3751,8 +3751,8 @@
         OS.pango_layout_set_attributes(layout, null);
     }
     OS.pango_layout_set_text(layout, buffer.ptr, buffer.length);
-    OS.pango_layout_set_single_paragraph_mode(layout, (flags & SWT.DRAW_DELIMITER) is 0);
-    OS.pango_layout_set_tabs(layout, (flags & SWT.DRAW_TAB) !is 0 ? null : data.device.emptyTab);
+    OS.pango_layout_set_single_paragraph_mode(layout, (flags & DWT.DRAW_DELIMITER) is 0);
+    OS.pango_layout_set_tabs(layout, (flags & DWT.DRAW_TAB) !is 0 ? null : data.device.emptyTab);
     data.str = str;
     data.stringWidth = data.stringHeight = -1;
     data.drawFlags = flags;
@@ -3760,8 +3760,8 @@
 
 /**
  * Sets the receiver's text anti-aliasing value to the parameter,
- * which must be one of <code>SWT.DEFAULT</code>, <code>SWT.OFF</code>
- * or <code>SWT.ON</code>. Note that this controls anti-aliasing only
+ * which must be one of <code>DWT.DEFAULT</code>, <code>DWT.OFF</code>
+ * or <code>DWT.ON</code>. Note that this controls anti-aliasing only
  * for all <em>text drawing</em> operations.
  * <p>
  * This operation requires the operating system's advanced
@@ -3772,10 +3772,10 @@
  * @param antialias the anti-aliasing setting
  *
  * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_ARGUMENT - if the parameter is not one of <code>SWT.DEFAULT</code>,
- *                                 <code>SWT.OFF</code> or <code>SWT.ON</code></li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the parameter is not one of <code>DWT.DEFAULT</code>,
+ *                                 <code>DWT.OFF</code> or <code>DWT.ON</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3787,16 +3787,16 @@
  * @since 3.1
  */
 public void setTextAntialias(int antialias) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (data.cairo is null && antialias is SWT.DEFAULT) return;
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (data.cairo is null && antialias is DWT.DEFAULT) return;
     int mode = 0;
     switch (antialias) {
-        case SWT.DEFAULT: mode = Cairo.CAIRO_ANTIALIAS_DEFAULT; break;
-        case SWT.OFF: mode = Cairo.CAIRO_ANTIALIAS_NONE; break;
-        case SWT.ON: mode = Cairo.CAIRO_ANTIALIAS_GRAY;
+        case DWT.DEFAULT: mode = Cairo.CAIRO_ANTIALIAS_DEFAULT; break;
+        case DWT.OFF: mode = Cairo.CAIRO_ANTIALIAS_NONE; break;
+        case DWT.ON: mode = Cairo.CAIRO_ANTIALIAS_GRAY;
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     initCairo();
     auto options = Cairo.cairo_font_options_create();
@@ -3825,7 +3825,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
@@ -3837,8 +3837,8 @@
  * @since 3.1
  */
 public void setTransform(Transform transform) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (transform !is null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (transform !is null && transform.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (data.cairo is null && transform is null) return;
     initCairo();
     auto cairo = data.cairo;
@@ -3865,14 +3865,14 @@
  *
  * @param xor if <code>true</code>, then <em>xor</em> mode is used, otherwise <em>source copy</em> mode is used
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @deprecated this functionality is not supported on some platforms
  */
 public void setXORMode(bool xor) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     OS.gdk_gc_set_function(handle, xor ? OS.GDK_XOR : OS.GDK_COPY);
     data.xorMode = xor;
 }
@@ -3892,7 +3892,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -3915,12 +3915,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Point textExtent(char[] str) {
-    return textExtent(str, SWT.DRAW_DELIMITER | SWT.DRAW_TAB);
+    return textExtent(str, DWT.DRAW_DELIMITER | DWT.DRAW_TAB);
 }
 
 /**
@@ -3950,13 +3950,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the str is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Point textExtent(char[] str, int flags) {
-    if (handle is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (str is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (str is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     auto cairo = data.cairo;
     if (cairo !is null) {
         if (OS.GTK_VERSION < OS.buildVERSION(2, 8, 0)) {
--- a/dwt/graphics/GCData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/GCData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.GCData;
 
 import dwt.internal.gtk.OS;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Device;
 import dwt.graphics.Pattern;
 import dwt.graphics.Image;
@@ -21,8 +21,8 @@
  * 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
+ * API for DWT. It is marked public only so that it can be shared
+ * within the packages provided by DWT. It is not available on all
  * platforms, and should never be called from application code.
  * </p>
  */
@@ -36,15 +36,15 @@
     public Pattern backgroundPattern;
     public GdkRegion* clipRgn;
     public float lineWidth;
-    public int lineStyle = SWT.LINE_SOLID;
+    public int lineStyle = DWT.LINE_SOLID;
     public float[] lineDashes;
     public float lineDashesOffset;
     public float lineMiterLimit = 10;
-    public int lineCap = SWT.CAP_FLAT;
-    public int lineJoin = SWT.JOIN_MITER;
+    public int lineCap = DWT.CAP_FLAT;
+    public int lineJoin = DWT.JOIN_MITER;
     public bool xorMode;
     public int alpha = 0xFF;
-    public int interpolation = SWT.DEFAULT;
+    public int interpolation = DWT.DEFAULT;
 
     public PangoContext* context;
     public PangoLayout* layout;
--- a/dwt/graphics/GlyphMetrics.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/GlyphMetrics.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.GlyphMetrics;
 
-import dwt.SWT;
+import dwt.DWT;
 import tango.text.convert.Format;
 /**
  * Instances of this class represent glyph metrics.
@@ -58,7 +58,7 @@
  */
 public this(int ascent, int descent, int width) {
     if (ascent < 0 || descent < 0 || width < 0) {
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     this.ascent = ascent;
     this.descent = descent;
--- a/dwt/graphics/Image.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Image.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,8 +13,8 @@
 import dwt.internal.Converter;
 import dwt.internal.cairo.Cairo;
 import dwt.internal.gtk.OS;
-import dwt.SWT;
-import dwt.SWTException;
+import dwt.DWT;
+import dwt.DWTException;
 import dwt.graphics.Color;
 import dwt.graphics.Device;
 import dwt.graphics.Drawable;
@@ -61,7 +61,7 @@
  * 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
+ * DWT. 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");
@@ -91,11 +91,11 @@
 
     /**
      * specifies whether the receiver is a bitmap or an icon
-     * (one of <code>SWT.BITMAP</code>, <code>SWT.ICON</code>)
+     * (one of <code>DWT.BITMAP</code>, <code>DWT.ICON</code>)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -105,9 +105,9 @@
      * The handle to the OS pixmap resource.
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -117,9 +117,9 @@
      * The handle to the OS mask resource.
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -192,13 +192,13 @@
  *    <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>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, int width, int height) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, width, height);
     if (device.tracking) device.new_Object(this);
 }
@@ -226,26 +226,26 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_INVALID_IMAGE - if the image is not a bitmap or an icon, or is otherwise in an invalid state</li>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the depth of the image is not supported</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, Image srcImage, int flag) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (srcImage is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (srcImage.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (srcImage is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (srcImage.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     switch (flag) {
-        case SWT.IMAGE_COPY:
-        case SWT.IMAGE_DISABLE:
-        case SWT.IMAGE_GRAY:
+        case DWT.IMAGE_COPY:
+        case DWT.IMAGE_DISABLE:
+        case DWT.IMAGE_GRAY:
             break;
         default:
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     this.device = device;
     this.type = srcImage.type;
@@ -257,14 +257,14 @@
     int height = h;
 
     /* Copy the mask */
-    if ((srcImage.type == SWT.ICON && srcImage.mask !is null ) || srcImage.transparentPixel != -1) {
+    if ((srcImage.type == DWT.ICON && srcImage.mask !is null ) || srcImage.transparentPixel != -1) {
         /* Generate the mask if necessary. */
         if (srcImage.transparentPixel != -1) srcImage.createMask();
         //PORTING_FIXME cast
         GdkDrawable* mask = cast(GdkDrawable*) OS.gdk_pixmap_new( null, width, height, 1);
-        if (mask is null ) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (mask is null ) DWT.error(DWT.ERROR_NO_HANDLES);
         auto gdkGC = OS.gdk_gc_new(mask);
-        if (gdkGC is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (gdkGC is null) DWT.error(DWT.ERROR_NO_HANDLES);
         OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height);
         OS.g_object_unref(gdkGC);
         this.mask = mask;
@@ -273,7 +273,7 @@
     }
 
     /* Copy transparent pixel and alpha data */
-    if (flag != SWT.IMAGE_DISABLE) transparentPixel = srcImage.transparentPixel;
+    if (flag != DWT.IMAGE_DISABLE) transparentPixel = srcImage.transparentPixel;
     alpha = srcImage.alpha;
     if (srcImage.alphaData != null) {
         alphaData = new byte[srcImage.alphaData.length];
@@ -283,12 +283,12 @@
 
     /* Create the new pixmap */
     auto pixmap = cast(GdkDrawable*) OS.gdk_pixmap_new (cast(GdkDrawable*)OS.GDK_ROOT_PARENT(), width, height, -1);
-    if (pixmap is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixmap is null) DWT.error(DWT.ERROR_NO_HANDLES);
     auto gdkGC = OS.gdk_gc_new(pixmap);
-    if (gdkGC is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (gdkGC is null) DWT.error(DWT.ERROR_NO_HANDLES);
     this.pixmap = pixmap;
 
-    if (flag == SWT.IMAGE_COPY) {
+    if (flag == DWT.IMAGE_COPY) {
         OS.gdk_draw_drawable(pixmap, gdkGC, srcImage.pixmap, 0, 0, 0, 0, width, height);
         OS.g_object_unref(gdkGC);
         if (device.tracking) device.new_Object(this);
@@ -297,7 +297,7 @@
 
     /* Retrieve the source pixmap data */
     auto pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
-    if (pixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
     auto colormap = OS.gdk_colormap_get_system();
     OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height);
     int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -305,13 +305,13 @@
 
     /* Apply transformation */
     switch (flag) {
-        case SWT.IMAGE_DISABLE: {
-            Color zeroColor = device.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+        case DWT.IMAGE_DISABLE: {
+            Color zeroColor = device.getSystemColor(DWT.COLOR_WIDGET_NORMAL_SHADOW);
             RGB zeroRGB = zeroColor.getRGB();
             byte zeroRed = cast(byte)zeroRGB.red;
             byte zeroGreen = cast(byte)zeroRGB.green;
             byte zeroBlue = cast(byte)zeroRGB.blue;
-            Color oneColor = device.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
+            Color oneColor = device.getSystemColor(DWT.COLOR_WIDGET_BACKGROUND);
             RGB oneRGB = oneColor.getRGB();
             byte oneRed = cast(byte)oneRGB.red;
             byte oneGreen = cast(byte)oneRGB.green;
@@ -339,7 +339,7 @@
             }
             break;
         }
-        case SWT.IMAGE_GRAY: {
+        case DWT.IMAGE_GRAY: {
             byte[] line = new byte[stride];
             for (int y=0; y<height; y++) {
                 memmove(line.ptr, pixels + (y * stride), stride);
@@ -393,14 +393,14 @@
  *    <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>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, Rectangle bounds) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (bounds is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, bounds.width, bounds.height);
     if (device.tracking) device.new_Object(this);
 }
@@ -416,23 +416,23 @@
  *    <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 SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the depth of the ImageData is not supported</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, ImageData data) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, 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>
+ * <code>DWT.ICON</code>, from the two given <code>ImageData</code>
  * objects. The two images must be the same size. Pixel transparency
  * in either image will be ignored.
  * <p>
@@ -451,17 +451,17 @@
  *    <li>ERROR_NULL_ARGUMENT - if either the source or mask is null </li>
  *    <li>ERROR_INVALID_ARGUMENT - if source and mask are different sizes</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, ImageData source, ImageData mask) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (source is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (mask is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (source is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (mask is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (source.width != mask.width || source.height != mask.height) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     mask = ImageData.convertMask (mask);
     ImageData image = new ImageData(source.width, source.height, source.depth, source.palette, source.scanlinePad, source.data);
@@ -492,7 +492,7 @@
  *          Image image = null;
  *          try {
  *               image = new Image (display, stream);
- *          } catch (SWTException ex) {
+ *          } catch (DWTException ex) {
  *          } finally {
  *               try {
  *                    stream.close ();
@@ -509,19 +509,19 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the stream</li>
  *    <li>ERROR_INVALID_IMAGE - if the image stream contains invalid data </li>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the image stream describes an image with an unsupported depth</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image stream contains an unrecognized format</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, InputStream stream) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     init(device, new ImageData(stream));
     if (device.tracking) device.new_Object(this);
 }
@@ -543,20 +543,20 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the file</li>
  *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data </li>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the image file describes an image with an unsupported depth</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image file contains an unrecognized format</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
  * </ul>
  */
 public this(Device device, char[] filename) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (filename is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (filename is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     try {
         int length = filename.length;
@@ -589,13 +589,13 @@
             }
             GdkPixmap* pixmap_return;
             OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap_return, null, 0);
-            this.type = SWT.BITMAP;
+            this.type = DWT.BITMAP;
             this.pixmap = cast(GdkDrawable*)pixmap_return;
-            if (pixmap is null) SWT.error(SWT.ERROR_NO_HANDLES);
+            if (pixmap is null) DWT.error(DWT.ERROR_NO_HANDLES);
             OS.g_object_unref (pixbuf);
             return;
         }
-    } catch (SWTException e) {}
+    } catch (DWTException e) {}
     init(device, new ImageData(filename));
     if (device.tracking) device.new_Object(this);
 }
@@ -603,7 +603,7 @@
 void createAlphaMask (int width, int height) {
     if (device.useXRender && (alpha != -1 || alphaData != null)) {
         mask = cast(GdkDrawable*)OS.gdk_pixmap_new(null, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8);
-        if (mask is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (mask is null) DWT.error(DWT.ERROR_NO_HANDLES);
         auto gc = OS.gdk_gc_new(mask);
         if (alpha != -1) {
             GdkColor* color = new GdkColor();
@@ -612,7 +612,7 @@
             OS.gdk_draw_rectangle(mask, gc, 1, 0, 0, 1, 1);
         } else {
             GdkImage* imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);
-            if (imagePtr is null) SWT.error(SWT.ERROR_NO_HANDLES);
+            if (imagePtr is null) DWT.error(DWT.ERROR_NO_HANDLES);
             GdkImage* gdkImage = new GdkImage();
             *gdkImage = *imagePtr;
             if (gdkImage.bpl == width) {
@@ -637,7 +637,7 @@
 void createMask() {
     if (mask !is null ) return;
     mask = createMask(getImageData(), false);
-    if (mask is null ) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (mask is null ) DWT.error(DWT.ERROR_NO_HANDLES);
 }
 
 GdkDrawable* createMask(ImageData image, bool copy) {
@@ -663,7 +663,7 @@
     int width = w, height = h;
     if (mask !is null || alpha != -1 || alphaData != null) {
         auto pixbuf = OS.gdk_pixbuf_new( OS.GDK_COLORSPACE_RGB, true, 8, width, height);
-        if (pixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (pixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
         auto colormap = OS.gdk_colormap_get_system();
         OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
         int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -671,7 +671,7 @@
         byte[] line = new byte[stride];
         if (mask !is null && OS.gdk_drawable_get_depth(mask) == 1) {
             auto maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
-            if (maskPixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+            if (maskPixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
             OS.gdk_pixbuf_get_from_drawable(maskPixbuf, mask, null, 0, 0, 0, 0, width, height);
             int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);
             auto maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
@@ -826,12 +826,12 @@
  *
  * @return the background color of the image, or null if there is no transparency in the image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Color getBackground() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (transparentPixel == -1) return null;
     //NOT DONE
     return null;
@@ -844,13 +844,13 @@
  *
  * @return a rectangle specifying the image's bounds
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (width != -1 && height != -1) {
         return new Rectangle(0, 0, width, height);
     }
@@ -866,7 +866,7 @@
  *
  * @return an <code>ImageData</code> containing the image's data and attributes
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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>
@@ -874,13 +874,13 @@
  * @see ImageData
  */
 public ImageData getImageData() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 
     int w, h;
     OS.gdk_drawable_get_size(pixmap, &w, &h);
     int width = w, height = h;
     auto pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
-    if (pixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
     auto colormap = OS.gdk_colormap_get_system();
     OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
     int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -894,10 +894,10 @@
     data.data = srcData;
     data.bytesPerLine = stride;
 
-    if (transparentPixel == -1 && type == SWT.ICON && mask !is null) {
+    if (transparentPixel == -1 && type == DWT.ICON && mask !is null) {
         /* Get the icon mask data */
         auto gdkImagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);
-        if (gdkImagePtr is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (gdkImagePtr is null) DWT.error(DWT.ERROR_NO_HANDLES);
         GdkImage* gdkImage = new GdkImage();
         memmove(gdkImage, gdkImagePtr, GdkImage.sizeof );
         byte[] maskData = new byte[gdkImage.bpl * gdkImage.height];
@@ -936,13 +936,13 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
  *
  * @param device the device on which to allocate the color
- * @param type the type of the image (<code>SWT.BITMAP</code> or <code>SWT.ICON</code>)
+ * @param type the type of the image (<code>DWT.BITMAP</code> or <code>DWT.ICON</code>)
  * @param pixmap the OS handle for the image
  * @param mask the OS handle for the image mask
  *
@@ -974,14 +974,14 @@
 
 void init(Device device, int width, int height) {
     if (width <= 0 || height <= 0) {
-        SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     }
     this.device = device;
-    this.type = SWT.BITMAP;
+    this.type = DWT.BITMAP;
 
     /* Create the pixmap */
     this.pixmap = cast(GdkDrawable*) OS.gdk_pixmap_new(cast(GdkDrawable*)OS.GDK_ROOT_PARENT(), width, height, -1);
-    if (pixmap is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixmap is null) DWT.error(DWT.ERROR_NO_HANDLES);
     /* Fill the bitmap with white */
     GdkColor* white = new GdkColor();
     white.red = 0xFFFF;
@@ -997,16 +997,16 @@
 }
 
 void init(Device device, ImageData image) {
-    if (image is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     int width = image.width;
     int height = image.height;
     PaletteData palette = image.palette;
     if (!(((image.depth == 1 || image.depth == 2 || image.depth == 4 || image.depth == 8) && !palette.isDirect) ||
         ((image.depth == 8) || (image.depth == 16 || image.depth == 24 || image.depth == 32) && palette.isDirect)))
-            SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
+            DWT.error (DWT.ERROR_UNSUPPORTED_DEPTH);
     auto pixbuf = OS.gdk_pixbuf_new( OS.GDK_COLORSPACE_RGB, false, 8, width, height);
-    if (pixbuf is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixbuf is null) DWT.error(DWT.ERROR_NO_HANDLES);
     int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
     auto data = OS.gdk_pixbuf_get_pixels(pixbuf);
     byte[] buffer = image.data;
@@ -1040,14 +1040,14 @@
     }
     memmove(data, buffer.ptr, stride * height);
     auto pixmap = cast(GdkDrawable*) OS.gdk_pixmap_new (cast(GdkDrawable*) OS.GDK_ROOT_PARENT(), width, height, -1);
-    if (pixmap is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (pixmap is null) DWT.error(DWT.ERROR_NO_HANDLES);
     auto gdkGC = OS.gdk_gc_new(pixmap);
-    if (gdkGC is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (gdkGC is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
     OS.g_object_unref(gdkGC);
     OS.g_object_unref(pixbuf);
 
-    bool isIcon = image.getTransparencyType() == SWT.TRANSPARENCY_MASK;
+    bool isIcon = image.getTransparencyType() == DWT.TRANSPARENCY_MASK;
     if (isIcon || image.transparentPixel != -1) {
         if (image.transparentPixel != -1) {
             RGB rgb = null;
@@ -1063,15 +1063,15 @@
             }
         }
         auto mask = createMask(image, isIcon);
-        if (mask is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (mask is null) DWT.error(DWT.ERROR_NO_HANDLES);
         this.mask = mask;
         if (isIcon) {
-            this.type = SWT.ICON;
+            this.type = DWT.ICON;
         } else {
-            this.type = SWT.BITMAP;
+            this.type = DWT.BITMAP;
         }
     } else {
-        this.type = SWT.BITMAP;
+        this.type = DWT.BITMAP;
         this.mask = null;
         this.alpha = image.alpha;
         if (image.alpha == -1 && image.alphaData != null) {
@@ -1088,7 +1088,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -1097,15 +1097,15 @@
  * @return the platform specific GC handle
  */
 public GdkGC* internal_new_GC (GCData data) {
-    if (pixmap is null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (type != SWT.BITMAP || memGC !is null) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (pixmap is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (type != DWT.BITMAP || memGC !is null) {
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     auto gdkGC = OS.gdk_gc_new(pixmap);
     if (data !is null) {
-        int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
+        int mask = DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
         if ((data.style & mask) == 0) {
-            data.style |= SWT.LEFT_TO_RIGHT;
+            data.style |= DWT.LEFT_TO_RIGHT;
         }
         data.device = device;
         data.drawable = pixmap;
@@ -1122,7 +1122,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -1178,14 +1178,14 @@
  *    <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>
+ * @exception DWTException <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);
-    if (color is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (color is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (transparentPixel == -1) return;
     //NOT DONE
 }
--- a/dwt/graphics/ImageData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/ImageData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -17,7 +17,7 @@
 import dwt.graphics.GC;
 import dwt.graphics.Device;
 import dwt.graphics.ImageDataLoader;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.CloneableCompatibility;
 
 public import dwt.dwthelper.InputStream;
@@ -263,7 +263,7 @@
 public this(int width, int height, int depth, PaletteData palette) {
     this(width, height, depth, palette,
         4, null, 0, null,
-        null, -1, -1, SWT.IMAGE_UNDEFINED,
+        null, -1, -1, DWT.IMAGE_UNDEFINED,
         0, 0, 0, 0);
 }
 
@@ -288,7 +288,7 @@
 public this(int width, int height, int depth, PaletteData palette, int scanlinePad, byte[] data) {
     this(width, height, depth, palette,
         scanlinePad, checkData(data), 0, null,
-        null, -1, -1, SWT.IMAGE_UNDEFINED,
+        null, -1, -1, DWT.IMAGE_UNDEFINED,
         0, 0, 0, 0);
 }
 
@@ -312,7 +312,7 @@
  *          ImageData imageData = null;
  *          try {
  *               imageData = new ImageData (stream);
- *          } catch (SWTException ex) {
+ *          } catch (DWTException ex) {
  *          } finally {
  *               try {
  *                    stream.close ();
@@ -327,7 +327,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the stream</li>
  *    <li>ERROR_INVALID_IMAGE - if the image stream contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image stream contains an unrecognized format</li>
@@ -337,7 +337,7 @@
  */
 public this(InputStream stream) {
     ImageData[] data = ImageDataLoader.load(stream);
-    if (data.length < 1) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (data.length < 1) DWT.error(DWT.ERROR_INVALID_IMAGE);
     ImageData i = data[0];
     setAllFields(
         i.width,
@@ -375,7 +375,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the file</li>
  *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image file contains an unrecognized format</li>
@@ -383,7 +383,7 @@
  */
 public this(char[] filename) {
     ImageData[] data = ImageDataLoader.load(filename);
-    if (data.length < 1) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (data.length < 1) DWT.error(DWT.ERROR_INVALID_IMAGE);
     ImageData i = data[0];
     setAllFields(
         i.width,
@@ -423,15 +423,15 @@
     byte[] alphaData, int alpha, int transparentPixel, int type,
     int x, int y, int disposalMethod, int delayTime)
 {
-    if (palette == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (palette == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (!(depth == 1 || depth == 2 || depth == 4 || depth == 8
         || depth == 16 || depth == 24 || depth == 32)) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     if (width <= 0 || height <= 0) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
-    if (scanlinePad == 0) SWT.error (SWT.ERROR_CANNOT_BE_ZERO);
+    if (scanlinePad == 0) DWT.error (DWT.ERROR_CANNOT_BE_ZERO);
 
     int bytesPerLine = (((width * depth + 7) / 8) + (scanlinePad - 1))
         / scanlinePad * scanlinePad;
@@ -489,12 +489,12 @@
 }
 
 /**
- * Invokes internal SWT functionality to create a new instance of
+ * Invokes internal DWT functionality to create a new instance of
  * this class.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
  * API for <code>ImageData</code>. It is marked public only so that it
- * can be shared within the packages provided by SWT. It is subject
+ * can be shared within the packages provided by DWT. It is subject
  * to change without notice, and should never be called from
  * application code.
  * </p>
@@ -515,7 +515,7 @@
 
 ImageData colorMaskImage(int pixel) {
     ImageData mask = new ImageData(width, height, 1, bwPalette(),
-        2, null, 0, null, null, -1, -1, SWT.IMAGE_UNDEFINED,
+        2, null, 0, null, null, -1, -1, DWT.IMAGE_UNDEFINED,
         0, 0, 0, 0);
     int[] row = new int[width];
     for (int y = 0; y < height; y++) {
@@ -533,7 +533,7 @@
 }
 
 static byte[] checkData(byte [] data) {
-    if (data == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (data == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return data;
 }
 
@@ -590,7 +590,7 @@
  * </ul>
  */
 public int getAlpha(int x, int y) {
-    if (x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 
     if (alphaData == null) return 255;
     return alphaData[y * width + x] & 0xFF;
@@ -615,8 +615,8 @@
  * </ul>
  */
 public void getAlphas(int x, int y, int getWidth, byte[] alphas, int startIndex) {
-    if (alphas == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (alphas == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (getWidth == 0) return;
 
     if (alphaData == null) {
@@ -641,12 +641,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if either argument is out of bounds</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH if the depth is not one of 1, 2, 4, 8, 16, 24 or 32</li>
  * </ul>
  */
 public int getPixel(int x, int y) {
-    if (x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     int index;
     int theByte;
     int mask;
@@ -690,7 +690,7 @@
             }
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
     return 0;
 }
 
@@ -711,14 +711,14 @@
  *    <li>ERROR_INVALID_ARGUMENT - if x or y is out of bounds</li>
  *    <li>ERROR_INVALID_ARGUMENT - if getWidth is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the depth is not one of 1, 2, 4 or 8
  *        (For higher depths, use the int[] version of this method.)</li>
  * </ul>
  */
 public void getPixels(int x, int y, int getWidth, byte[] pixels, int startIndex) {
-    if (pixels == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (pixels == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (getWidth == 0) return;
     int index;
     int theByte;
@@ -839,7 +839,7 @@
             return;
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 }
 
 /**
@@ -859,13 +859,13 @@
  *    <li>ERROR_INVALID_ARGUMENT - if x or y is out of bounds</li>
  *    <li>ERROR_INVALID_ARGUMENT - if getWidth is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH - if the depth is not one of 1, 2, 4, 8, 16, 24 or 32</li>
  * </ul>
  */
 public void getPixels(int x, int y, int getWidth, int[] pixels, int startIndex) {
-    if (pixels == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (pixels == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (getWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (getWidth == 0) return;
     int index;
     int theByte;
@@ -1034,7 +1034,7 @@
             return;
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 }
 
 /**
@@ -1059,7 +1059,7 @@
  * @return the transparency mask
  */
 public ImageData getTransparencyMask() {
-    if (getTransparencyType() == SWT.TRANSPARENCY_MASK) {
+    if (getTransparencyType() == DWT.TRANSPARENCY_MASK) {
         return new ImageData(width, height, 1, bwPalette(), maskPad, maskData);
     } else {
         return colorMaskImage(transparentPixel);
@@ -1068,16 +1068,16 @@
 
 /**
  * Returns the image transparency type, which will be one of
- * <code>SWT.TRANSPARENCY_NONE</code>, <code>SWT.TRANSPARENCY_MASK</code>,
- * <code>SWT.TRANSPARENCY_PIXEL</code> or <code>SWT.TRANSPARENCY_ALPHA</code>.
+ * <code>DWT.TRANSPARENCY_NONE</code>, <code>DWT.TRANSPARENCY_MASK</code>,
+ * <code>DWT.TRANSPARENCY_PIXEL</code> or <code>DWT.TRANSPARENCY_ALPHA</code>.
  *
  * @return the receiver's transparency type
  */
 public int getTransparencyType() {
-    if (maskData != null) return SWT.TRANSPARENCY_MASK;
-    if (transparentPixel != -1) return SWT.TRANSPARENCY_PIXEL;
-    if (alphaData != null) return SWT.TRANSPARENCY_ALPHA;
-    return SWT.TRANSPARENCY_NONE;
+    if (maskData != null) return DWT.TRANSPARENCY_MASK;
+    if (transparentPixel != -1) return DWT.TRANSPARENCY_PIXEL;
+    if (alphaData != null) return DWT.TRANSPARENCY_ALPHA;
+    return DWT.TRANSPARENCY_NONE;
 }
 
 /**
@@ -1164,7 +1164,7 @@
  */
 public void setAlpha(int x, int y, int alpha) {
     if (x >= width || y >= height || x < 0 || y < 0 || alpha < 0 || alpha > 255)
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 
     if (alphaData == null) alphaData = new byte[width * height];
     alphaData[y * width + x] = cast(byte)alpha;
@@ -1190,8 +1190,8 @@
  * </ul>
  */
 public void setAlphas(int x, int y, int putWidth, byte[] alphas, int startIndex) {
-    if (alphas == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (alphas == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (putWidth == 0) return;
 
     if (alphaData == null) alphaData = new byte[width * height];
@@ -1210,12 +1210,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if x or y is out of bounds</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH if the depth is not one of 1, 2, 4, 8, 16, 24 or 32</li>
  * </ul>
  */
 public void setPixel(int x, int y, int pixelValue) {
-    if (x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     int index;
     byte theByte;
     int mask;
@@ -1269,7 +1269,7 @@
             return;
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 }
 
 /**
@@ -1290,14 +1290,14 @@
  *    <li>ERROR_INVALID_ARGUMENT - if x or y is out of bounds</li>
  *    <li>ERROR_INVALID_ARGUMENT - if putWidth is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH if the depth is not one of 1, 2, 4, 8
  *        (For higher depths, use the int[] version of this method.)</li>
  * </ul>
  */
 public void setPixels(int x, int y, int putWidth, byte[] pixels, int startIndex) {
-    if (pixels == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (pixels == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (putWidth == 0) return;
     int index;
     int theByte;
@@ -1395,7 +1395,7 @@
             return;
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 }
 
 /**
@@ -1416,13 +1416,13 @@
  *    <li>ERROR_INVALID_ARGUMENT - if x or y is out of bounds</li>
  *    <li>ERROR_INVALID_ARGUMENT - if putWidth is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_UNSUPPORTED_DEPTH if the depth is not one of 1, 2, 4, 8, 16, 24 or 32</li>
  * </ul>
  */
 public void setPixels(int x, int y, int putWidth, int[] pixels, int startIndex) {
-    if (pixels == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (pixels == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (putWidth < 0 || x >= width || y >= height || x < 0 || y < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (putWidth == 0) return;
     int index;
     int theByte;
@@ -1575,7 +1575,7 @@
             return;
         default:
     }
-    SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+    DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 }
 
 /**
--- a/dwt/graphics/ImageLoader.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/ImageLoader.d	Tue Jan 15 06:44:34 2008 +0100
@@ -15,7 +15,7 @@
 public import dwt.graphics.ImageLoaderEvent;
 public import dwt.graphics.ImageData;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.Compatibility;
 import dwt.internal.image.FileFormat;
 
@@ -121,14 +121,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the stream</li>
  *    <li>ERROR_INVALID_IMAGE - if the image stream contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image stream contains an unrecognized format</li>
  * </ul>
  */
 public ImageData[] load(InputStream stream) {
-    if (stream is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (stream is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     reset();
     data = FileFormat.load(stream, this);
     return data;
@@ -146,14 +146,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while reading from the file</li>
  *    <li>ERROR_INVALID_IMAGE - if the image file contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image file contains an unrecognized format</li>
  * </ul>
  */
 public ImageData[] load(char[] filename) {
-    if (filename is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (filename is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     InputStream stream = null;
     void close(){
         try {
@@ -168,7 +168,7 @@
 
         return load(stream);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return null;
 }
@@ -197,14 +197,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the stream is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while writing to the stream</li>
  *    <li>ERROR_INVALID_IMAGE - if the image data contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image data cannot be saved to the requested format</li>
  * </ul>
  */
 public void save(OutputStream stream, int format) {
-    if (stream is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (stream is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     FileFormat.save(stream, format, this);
 }
 
@@ -232,19 +232,19 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the file name is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_IO - if an IO error occurs while writing to the file</li>
  *    <li>ERROR_INVALID_IMAGE - if the image data contains invalid data</li>
  *    <li>ERROR_UNSUPPORTED_FORMAT - if the image data cannot be saved to the requested format</li>
  * </ul>
  */
 public void save(char[] filename, int format) {
-    if (filename is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (filename is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     OutputStream stream = null;
     try {
         stream = Compatibility.newFileOutputStream(filename);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     save(stream, format);
     try {
@@ -273,7 +273,7 @@
  * @see ImageLoaderEvent
  */
 public void addImageLoaderListener(ImageLoaderListener listener) {
-    if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     imageLoaderListeners ~= listener;
 }
 
@@ -290,7 +290,7 @@
  * @see #addImageLoaderListener(ImageLoaderListener)
  */
 public void removeImageLoaderListener(ImageLoaderListener listener) {
-    if (listener is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     if (imageLoaderListeners.length == 0 ) return;
     tango.core.Array.remove( imageLoaderListeners, listener, delegate bool(ImageLoaderListener l1, ImageLoaderListener l2 ){ return l1 is l2; });
 }
--- a/dwt/graphics/ImageLoaderEvent.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/ImageLoaderEvent.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.ImageLoaderEvent;
 
 
-public import dwt.internal.SWTEventObject;
+public import dwt.internal.DWTEventObject;
 public import dwt.graphics.ImageLoader;
 public import dwt.graphics.ImageData;
 
@@ -35,7 +35,7 @@
  * @see ImageLoaderListener
  */
 
-public class ImageLoaderEvent : SWTEventObject {
+public class ImageLoaderEvent : DWTEventObject {
 
     /**
      * if the <code>endOfImage</code> flag is false, then this is a
--- a/dwt/graphics/ImageLoaderListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/ImageLoaderListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,7 +12,7 @@
 
 
 public import dwt.graphics.ImageLoaderEvent;
-public import dwt.internal.SWTEventListener;
+public import dwt.internal.DWTEventListener;
 
 /**
  * Classes which implement this interface provide methods
@@ -30,7 +30,7 @@
  * @see ImageLoaderEvent
  */
 
-public interface ImageLoaderListener : SWTEventListener {
+public interface ImageLoaderListener : DWTEventListener {
 
 /**
  * Sent when image data is either partially or completely loaded.
--- a/dwt/graphics/LineAttributes.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/LineAttributes.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.LineAttributes;
 
-import dwt.SWT;
+import dwt.DWT;
 
 /**
  * <code>LineAttributes</code> defines a set of line attributes that
@@ -36,40 +36,40 @@
     /**
      * The line style.
      *
-     * @see dwt.SWT#LINE_CUSTOM
-     * @see dwt.SWT#LINE_DASH
-     * @see dwt.SWT#LINE_DASHDOT
-     * @see dwt.SWT#LINE_DASHDOTDOT
-     * @see dwt.SWT#LINE_DOT
-     * @see dwt.SWT#LINE_SOLID
+     * @see dwt.DWT#LINE_CUSTOM
+     * @see dwt.DWT#LINE_DASH
+     * @see dwt.DWT#LINE_DASHDOT
+     * @see dwt.DWT#LINE_DASHDOTDOT
+     * @see dwt.DWT#LINE_DOT
+     * @see dwt.DWT#LINE_SOLID
      */
     public int style;
 
     /**
      * The line cap style.
      *
-     * @see dwt.SWT#CAP_FLAT
-     * @see dwt.SWT#CAP_ROUND
-     * @see dwt.SWT#CAP_SQUARE
+     * @see dwt.DWT#CAP_FLAT
+     * @see dwt.DWT#CAP_ROUND
+     * @see dwt.DWT#CAP_SQUARE
      */
     public int cap;
 
     /**
      * The line join style.
      *
-     * @see dwt.SWT#JOIN_BEVEL
-     * @see dwt.SWT#JOIN_MITER
-     * @see dwt.SWT#JOIN_ROUND
+     * @see dwt.DWT#JOIN_BEVEL
+     * @see dwt.DWT#JOIN_MITER
+     * @see dwt.DWT#JOIN_ROUND
      */
     public int join;
 
     /**
-     * The line dash style for SWT.LINE_CUSTOM.
+     * The line dash style for DWT.LINE_CUSTOM.
      */
     public float[] dash;
 
     /**
-     * The line dash style offset for SWT.LINE_CUSTOM.
+     * The line dash style offset for DWT.LINE_CUSTOM.
      */
     public float dashOffset;
 
@@ -84,7 +84,7 @@
  * @param width the line width
  */
 public this(float width) {
-    this(width, SWT.CAP_FLAT, SWT.JOIN_MITER, SWT.LINE_SOLID, null, 0, 10);
+    this(width, DWT.CAP_FLAT, DWT.JOIN_MITER, DWT.LINE_SOLID, null, 0, 10);
 }
 
 /**
@@ -95,7 +95,7 @@
  * @param join the line join style
  */
 public this(float width, int cap, int join) {
-    this(width, cap, join, SWT.LINE_SOLID, null, 0, 10);
+    this(width, cap, join, DWT.LINE_SOLID, null, 0, 10);
 }
 
 /**
--- a/dwt/graphics/PaletteData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/PaletteData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.PaletteData;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.RGB;
 
 /**
@@ -107,7 +107,7 @@
  * </ul>
  */
 public this(RGB[] colors) {
-    if (colors == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (colors == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.colors = colors;
     this.isDirect = false;
 }
@@ -141,7 +141,7 @@
  * </ul>
  */
 public int getPixel(RGB rgb) {
-    if (rgb is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rgb is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (isDirect) {
         int pixel = 0;
         pixel |= (redShift < 0 ? rgb.red << -redShift : rgb.red >>> redShift) & redMask;
@@ -153,7 +153,7 @@
             if (colors[i] == rgb ) return i;
         }
         /* The RGB did not exist in the palette */
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         return 0;
     }
 }
@@ -180,7 +180,7 @@
         return new RGB(r, g, b);
     } else {
         if (pixel < 0 || pixel >= colors.length) {
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         }
         return colors[pixel];
     }
--- a/dwt/graphics/Path.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Path.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.Path;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.Compatibility;
 import dwt.internal.cairo.Cairo;
 import dwt.graphics.Resource;
@@ -46,9 +46,9 @@
      * the OS resource for the Path
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -69,10 +69,10 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the device is null and there is no current device</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the path could not be obtained</li>
  * </ul>
  *
@@ -80,14 +80,14 @@
  */
 public this (Device device) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     device.checkCairo();
     auto surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);
-    if (surface is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (surface is null) DWT.error(DWT.ERROR_NO_HANDLES);
     handle = Cairo.cairo_create(surface);
     Cairo.cairo_surface_destroy(surface);
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -116,12 +116,12 @@
  * @param startAngle the beginning angle
  * @param arcAngle the angular extent of the arc, relative to the start angle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void addArc(float x, float y, float width, float height, float startAngle, float arcAngle) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     moved = true;
     if (width == height) {
         float angle = -startAngle * cast(float)Compatibility.PI / 180;
@@ -157,17 +157,17 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void addPath(Path path) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (path is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (path is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (path.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     moved = false;
     auto copy = Cairo.cairo_copy_path(path.handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_append_path(handle, copy);
     Cairo.cairo_path_destroy(copy);
     closed = path.closed;
@@ -181,12 +181,12 @@
  * @param width the width of the rectangle to add
  * @param height the height of the rectangle to add
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void addRectangle(float x, float y, float width, float height) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     moved = false;
     Cairo.cairo_rectangle(handle, x, y, width, height);
     closed = true;
@@ -205,14 +205,14 @@
  *    <li>ERROR_NULL_ARGUMENT - if the font is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void addString(char[] str, float x, float y, Font font) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (font == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (font == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     moved = false;
     GC.addCairoString(handle, str, x, y, font);
     closed = true;
@@ -223,12 +223,12 @@
  * from the current point of the path back to the starting point
  * of the sub path.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void close() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     Cairo.cairo_close_path(handle);
     moved = false;
     closed = true;
@@ -253,21 +253,21 @@
  *    <li>ERROR_NULL_ARGUMENT - if the gc is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the gc has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool contains(float x, float y, GC gc, bool outline) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (gc == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (gc.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (gc == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (gc.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     //TODO - see Windows
     gc.initCairo();
     gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH);
     bool result = false;
     auto cairo = gc.data.cairo;
     auto copy = Cairo.cairo_copy_path(handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_append_path(cairo, copy);
     Cairo.cairo_path_destroy(copy);
     if (outline) {
@@ -289,12 +289,12 @@
  * @param x the x coordinate of the end point of the spline
  * @param y the y coordinate of the end point of the spline
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (!moved) {
         double currentX, currentY;
         Cairo.cairo_get_current_point(handle, &currentX, &currentY);
@@ -316,16 +316,16 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter is too small to hold the bounding box</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void getBounds(float[] bounds) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (bounds == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (bounds.length < 4) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     auto copy = Cairo.cairo_copy_path(handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     cairo_path_t* path = new cairo_path_t();
     memmove(path, copy, cairo_path_t.sizeof);
     double minX = 0, minY = 0, maxX = 0, maxY = 0;
@@ -386,14 +386,14 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parameter is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parameter is too small to hold the end point</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void getCurrentPoint(float[] point) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (point == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (point.length < 2) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (point == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (point.length < 2) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     double x, y;
     Cairo.cairo_get_current_point(handle, &x, &y);
     point[0] = cast(float)x;
@@ -405,16 +405,16 @@
  *
  * @return the PathData for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see PathData
  */
 public PathData getPathData() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     auto copy = Cairo.cairo_copy_path(handle);
-    if (copy is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (copy is null) DWT.error(DWT.ERROR_NO_HANDLES);
     cairo_path_t* path = new cairo_path_t();
     *path = *copy;
     byte[] types = new byte[path.num_data];
@@ -427,17 +427,17 @@
         while (i < path.num_data) {
             switch (data.header.type) {
                 case Cairo.CAIRO_PATH_MOVE_TO:
-                    types[typeIndex++] = SWT.PATH_MOVE_TO;
+                    types[typeIndex++] = DWT.PATH_MOVE_TO;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.x;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.y;
                     break;
                 case Cairo.CAIRO_PATH_LINE_TO:
-                    types[typeIndex++] = SWT.PATH_LINE_TO;
+                    types[typeIndex++] = DWT.PATH_LINE_TO;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.x;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.y;
                     break;
                 case Cairo.CAIRO_PATH_CURVE_TO:
-                    types[typeIndex++] = SWT.PATH_CUBIC_TO;
+                    types[typeIndex++] = DWT.PATH_CUBIC_TO;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.x;
                     pts[ptsIndex++] = cast(float)path.data[i+1].point.y;
                     pts[ptsIndex++] = cast(float)path.data[i+2].point.x;
@@ -446,7 +446,7 @@
                     pts[ptsIndex++] = cast(float)path.data[i+3].point.y;
                     break;
                 case Cairo.CAIRO_PATH_CLOSE_PATH:
-                    types[typeIndex++] = SWT.PATH_CLOSE;
+                    types[typeIndex++] = DWT.PATH_CLOSE;
                     break;
                 default:
             }
@@ -477,12 +477,12 @@
  * @param x the x coordinate of the end of the line to add
  * @param y the y coordinate of the end of the line to add
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void lineTo(float x, float y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (!moved) {
         double currentX, currentY;
         Cairo.cairo_get_current_point(handle, &currentX, &currentY);
@@ -501,12 +501,12 @@
  * @param x the x coordinate of the new end point
  * @param y the y coordinate of the new end point
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void moveTo(float x, float y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     /*
     * Bug in Cairo.  If cairo_move_to() is not called at the
     * begining of a subpath, the first cairo_line_to() or
@@ -527,12 +527,12 @@
  * @param x the x coordinate of the end point of the spline
  * @param y the y coordinate of the end point of the spline
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void quadTo(float cx, float cy, float x, float y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     double currentX, currentY;
     Cairo.cairo_get_current_point(handle, &currentX, &currentY);
     if (!moved) {
--- a/dwt/graphics/Pattern.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Pattern.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.Pattern;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Resource;
 import dwt.graphics.Color;
 import dwt.graphics.GC;
@@ -42,9 +42,9 @@
      * the OS resource for the Pattern
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -66,10 +66,10 @@
  *    <li>ERROR_NULL_ARGUMENT - if the device is null and there is no current device, or the image is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the pattern could not be obtained</li>
  * </ul>
  *
@@ -77,14 +77,14 @@
  */
 public this(Device device, Image image) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (image is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (image.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.device = device;
     device.checkCairo();
     image.createSurface();
     handle = Cairo.cairo_pattern_create_for_surface(image.surface);
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_pattern_set_extend(handle, Cairo.CAIRO_EXTEND_REPEAT);
     if (device.tracking) device.new_Object(this);
 }
@@ -112,10 +112,10 @@
  *                              or if either color1 or color2 is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if either color1 or color2 has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the pattern could not be obtained</li>
  * </ul>
  *
@@ -149,10 +149,10 @@
  *                              or if either color1 or color2 is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if either color1 or color2 has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the pattern could not be obtained</li>
  * </ul>
  *
@@ -162,15 +162,15 @@
  */
 public this(Device device, float x1, float y1, float x2, float y2, Color color1, int alpha1, Color color2, int alpha2) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color1 is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color1.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-    if (color2 is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (color2.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color1 is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color1.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+    if (color2 is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (color2.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.device = device;
     device.checkCairo();
     handle = Cairo.cairo_pattern_create_linear(x1, y1, x2, y2);
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     GC.setCairoPatternColor(handle, 0, color1, alpha1);
     GC.setCairoPatternColor(handle, 1, color2, alpha2);
     Cairo.cairo_pattern_set_extend(handle, Cairo.CAIRO_EXTEND_REPEAT);
--- a/dwt/graphics/RGB.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/RGB.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 public import dwt.internal.SerializableCompatibility;
 
-import dwt.SWT;
+import dwt.DWT;
 import Math = tango.math.Math : min, max;
 import tango.text.convert.Format;
 
@@ -74,7 +74,7 @@
     if ((red > 255) || (red < 0) ||
         (green > 255) || (green < 0) ||
         (blue > 255) || (blue < 0))
-            SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+            DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     this.red = red;
     this.green = green;
     this.blue = blue;
@@ -98,7 +98,7 @@
 public this (float hue, float saturation, float brightness) {
     if (hue < 0 || hue > 360 || saturation < 0 || saturation > 1 ||
         brightness < 0 || brightness > 1) {
-        SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     }
     float r, g, b;
     if (saturation == 0) {
--- a/dwt/graphics/Rectangle.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Rectangle.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,8 +13,8 @@
 public import dwt.graphics.Point;
 public import dwt.internal.SerializableCompatibility;
 
-import dwt.SWT;
-import dwt.SWTError;
+import dwt.DWT;
+import dwt.DWTError;
 import tango.text.convert.Format;
 
 /**
@@ -100,7 +100,7 @@
  * </ul>
  */
 public void add (Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     int left = x < rect.x ? x : rect.x;
     int top = y < rect.y ? y : rect.y;
     int lhs = x + width;
@@ -138,7 +138,7 @@
  * </ul>
  */
 public bool contains (Point pt) {
-    if (pt == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (pt == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return contains(pt.x, pt.y);
 }
 
@@ -188,7 +188,7 @@
  * since 3.0
  */
 public void intersect (Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (this is rect) return;
     int left = x > rect.x ? x : rect.x;
     int top = y > rect.y ? y : rect.y;
@@ -220,7 +220,7 @@
  * </ul>
  */
 public Rectangle intersection (Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (this is rect) return new Rectangle (x, y, width, height);
     int left = x > rect.x ? x : rect.x;
     int top = y > rect.y ? y : rect.y;
@@ -285,7 +285,7 @@
  * @see #isEmpty()
  */
 public bool intersects (Rectangle rect) {
-    if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return rect == this || intersects (rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -334,7 +334,7 @@
  * @see #add(Rectangle)
  */
 public Rectangle makeUnion (Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     int left = x < rect.x ? x : rect.x;
     int top = y < rect.y ? y : rect.y;
     int lhs = x + width;
--- a/dwt/graphics/Region.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Region.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.graphics.Region;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Resource;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
@@ -35,9 +35,9 @@
      * the OS resource for the region
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -46,7 +46,7 @@
 /**
  * Constructs a new empty region.
  *
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for region creation</li>
  * </ul>
  */
@@ -65,7 +65,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for region creation</li>
  * </ul>
  *
@@ -75,10 +75,10 @@
  */
 public this(Device device) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     handle = OS.gdk_region_new();
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     if (device.tracking) device.new_Object(this);
 }
 
@@ -96,7 +96,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -104,8 +104,8 @@
 *
  */
 public void add (int[] pointArray) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 //PORTING_FIXME: shall the pointArray be changed to be GdkPoint[] ?
     auto polyRgn = OS.gdk_region_polygon(cast(GdkPoint*)pointArray.ptr, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
     OS.gdk_region_union(handle, polyRgn);
@@ -122,13 +122,13 @@
  *    <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>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     add (rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -144,15 +144,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the rectangle's width or height is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void add(int x, int y, int width, int height) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (width < 0 || height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     GdkRectangle* gdkRect = new GdkRectangle();
     gdkRect.x = x;
     gdkRect.y = y;
@@ -172,14 +172,14 @@
  *    <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>
+ * @exception DWTException <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 is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (region is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     OS.gdk_region_union(handle, region.handle);
 }
 
@@ -192,12 +192,12 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool contains(int x, int y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return cast(bool)OS.gdk_region_point_in(handle, x, y);
 }
 
@@ -212,12 +212,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool contains(Point pt) {
-    if (pt is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (pt is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return contains(pt.x, pt.y);
 }
 
@@ -260,14 +260,14 @@
  *
  * @return a bounding rectangle for the region
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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);
+    if (isDisposed()) DWT.error(DWT.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);
@@ -301,15 +301,15 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void intersect(Rectangle rect) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     intersect (rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -325,15 +325,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the rectangle's width or height is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void intersect(int x, int y, int width, int height) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (width < 0 || height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     GdkRectangle* gdkRect = new GdkRectangle();
     gdkRect.x = x;
     gdkRect.y = y;
@@ -355,16 +355,16 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void intersect(Region region) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (region is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (region is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     OS.gdk_region_intersect(handle, region.handle);
 }
 
@@ -379,14 +379,14 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see Rectangle#intersects(Rectangle)
  */
 public bool intersects (int x, int y, int width, int height) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     GdkRectangle* gdkRect = new GdkRectangle();
     gdkRect.x = x;
     gdkRect.y = y;
@@ -405,14 +405,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see Rectangle#intersects(Rectangle)
  */
 public bool intersects(Rectangle rect) {
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return intersects(rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -437,12 +437,12 @@
  *
  * @return <code>true</code> if the receiver is empty, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public bool isEmpty() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     return cast(bool)OS.gdk_region_empty(handle);
 }
 
@@ -455,15 +455,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void subtract (int[] pointArray) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     auto polyRgn = OS.gdk_region_polygon( cast(GdkPoint*)pointArray.ptr, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
     OS.gdk_region_subtract(handle, polyRgn);
     OS.gdk_region_destroy(polyRgn);
@@ -479,15 +479,15 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void subtract(Rectangle rect) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (rect is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (rect is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     subtract (rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -503,15 +503,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the rectangle's width or height is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void subtract(int x, int y, int width, int height) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (width < 0 || height < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     GdkRectangle* gdkRect = new GdkRectangle();
     gdkRect.x = x;
     gdkRect.y = y;
@@ -533,16 +533,16 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.0
  */
 public void subtract(Region region) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (region is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (region is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     OS.gdk_region_subtract(handle, region.handle);
 }
 
@@ -553,14 +553,14 @@
  * @param x the x coordinate of the point to translate
  * @param y the y coordinate of the point to translate
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void translate (int x, int y) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     OS.gdk_region_offset (handle, x, y);
 }
 
@@ -573,15 +573,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @since 3.1
  */
 public void translate (Point pt) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pt is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pt is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     translate (pt.x, pt.y);
 }
 
--- a/dwt/graphics/Resource.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Resource.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.Resource;
 
-import dwt.SWT;
+import dwt.DWT;
 
 import dwt.graphics.Device;
 import dwt.internal.c.gdk;
@@ -20,8 +20,8 @@
  * Resources created by the application must be disposed.
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation. However, it has not been marked
- * final to allow those outside of the SWT development team to implement
+ * within the DWT implementation. However, it has not been marked
+ * final to allow those outside of the DWT development team to implement
  * patched versions of the class in order to get around specific
  * limitations in advance of when those limitations can be addressed
  * by the team.  Any class built using subclassing to access the internals
@@ -61,7 +61,7 @@
  */
 public Device getDevice() {
     Device device = this.device;
-    if (device is null || isDisposed ()) SWT.error (SWT.ERROR_GRAPHIC_DISPOSED);
+    if (device is null || isDisposed ()) DWT.error (DWT.ERROR_GRAPHIC_DISPOSED);
     return device;
 }
 
--- a/dwt/graphics/TextLayout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/TextLayout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 import dwt.internal.cairo.Cairo;
 import dwt.internal.gtk.OS;
 import dwt.internal.Converter;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Color;
 import dwt.graphics.Device;
 import dwt.graphics.Font;
@@ -87,15 +87,15 @@
  */
 public this (Device device) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     context = OS.gdk_pango_context_get();
-    if (context is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (context is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.pango_context_set_language(context, OS.gtk_get_default_language());
     OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
     OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());
     layout = OS.pango_layout_new(context);
-    if (layout is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (layout is null) DWT.error(DWT.ERROR_NO_HANDLES);
     OS.pango_layout_set_wrap(layout, OS.PANGO_WRAP_WORD_CHAR);
     OS.pango_layout_set_tabs(layout, device.emptyTab);
     if (OS.GTK_VERSION >= OS.buildVERSION(2, 4, 0)) {
@@ -110,7 +110,7 @@
 }
 
 void checkLayout() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 }
 
 void computeRuns () {
@@ -126,7 +126,7 @@
     int segementsWLength = segmentsTextW.length;
     if ((ascent != -1  || descent != -1) && segementsWLength > 0) {
         auto iter = OS.pango_layout_get_iter(layout);
-        if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+        if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
         PangoRectangle* rect = new PangoRectangle();
         if (ascent != -1) rect.y =  -(ascent  * OS.PANGO_SCALE);
         rect.height = (Math.max(0, ascent) + Math.max(0, descent)) * OS.PANGO_SCALE;
@@ -273,7 +273,7 @@
  * @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 SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  * @exception IllegalArgumentException <ul>
@@ -296,7 +296,7 @@
  * @param selectionForeground selection foreground, or NULL to use the system default color
  * @param selectionBackground selection background, or NULL to use the system default color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  * @exception IllegalArgumentException <ul>
@@ -311,9 +311,9 @@
  * Draws the receiver's text using the specified GC at the specified
  * point.
  * <p>
- * The parameter <code>flags</code> can include one of <code>SWT.DELIMITER_SELECTION</code>
- * or <code>SWT.FULL_SELECTION</code> to specify the selection behavior on all lines except
- * for the last line, and can also include <code>SWT.LAST_LINE_SELECTION</code> to extend
+ * The parameter <code>flags</code> can include one of <code>DWT.DELIMITER_SELECTION</code>
+ * or <code>DWT.FULL_SELECTION</code> to specify the selection behavior on all lines except
+ * for the last line, and can also include <code>DWT.LAST_LINE_SELECTION</code> to extend
  * the specified selection behavior to the last line.
  * </p>
  * @param gc the GC to draw
@@ -325,7 +325,7 @@
  * @param selectionBackground selection background, or NULL to use the system default color
  * @param flags drawing options
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  * @exception IllegalArgumentException <ul>
@@ -337,16 +337,16 @@
 public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground, int flags) {
     checkLayout ();
     computeRuns();
-    if (gc is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (gc.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-    if (selectionForeground !is null && selectionForeground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-    if (selectionBackground !is null && selectionBackground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (gc is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (gc.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+    if (selectionForeground !is null && selectionForeground.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+    if (selectionBackground !is null && selectionBackground.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     gc.checkGC(GC.FOREGROUND);
     int length = text.length;
     bool hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
     GCData data = gc.data;
     auto cairo = data.cairo;
-    if (flags != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) {
+    if (flags != 0 && (hasSelection || (flags & DWT.LAST_LINE_SELECTION) != 0)) {
         PangoLogAttr* attrs;
         int nAttrs;
         PangoLogAttr* logAttr = new PangoLogAttr();
@@ -354,7 +354,7 @@
         int lineCount = OS.pango_layout_get_line_count(layout);
         auto ptr = OS.pango_layout_get_text(layout);
         auto iter = OS.pango_layout_get_iter(layout);
-        if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
+        if (selectionBackground == null) selectionBackground = device.getSystemColor(DWT.COLOR_LIST_SELECTION);
         if (cairo !is null && OS.GTK_VERSION >= OS.buildVERSION(2, 8, 0)) {
             Cairo.cairo_save(cairo);
             GdkColor* color = selectionBackground.handle;
@@ -373,7 +373,7 @@
                 lineEnd = OS.g_utf8_strlen(ptr, -1);
             }
             bool extent = false;
-            if (lineIndex == lineCount - 1 && (flags & SWT.LAST_LINE_SELECTION) != 0) {
+            if (lineIndex == lineCount - 1 && (flags & DWT.LAST_LINE_SELECTION) != 0) {
                 extent = true;
             } else {
                 if (attrs is null) OS.pango_layout_get_log_attrs(layout, &attrs, &nAttrs);
@@ -381,7 +381,7 @@
                 if (!( logAttr.bitfield0 & 0x01 /* PangoLogAttr.is_line_break is Bit0 */)) {
                     if (selectionStart <= lineEnd && lineEnd <= selectionEnd) extent = true;
                 } else {
-                    if (selectionStart <= lineEnd && lineEnd < selectionEnd && (flags & SWT.FULL_SELECTION) != 0) {
+                    if (selectionStart <= lineEnd && lineEnd < selectionEnd && (flags & DWT.FULL_SELECTION) != 0) {
                         extent = true;
                     }
                 }
@@ -393,7 +393,7 @@
                 if (ascent != -1 && descent != -1) {
                     height = Math.max (height, ascent + descent);
                 }
-                int width = (flags & SWT.FULL_SELECTION) != 0 ? 0x7fffffff : height / 3;
+                int width = (flags & DWT.FULL_SELECTION) != 0 ? 0x7fffffff : height / 3;
                 if (cairo !is null && OS.GTK_VERSION >= OS.buildVERSION(2, 8, 0)) {
                     Cairo.cairo_rectangle(cairo, lineX, lineY, width, height);
                     Cairo.cairo_fill(cairo);
@@ -425,8 +425,8 @@
         length = OS.g_utf8_strlen(OS.pango_layout_get_text(layout), -1);
         selectionStart = translateOffset(selectionStart);
         selectionEnd = translateOffset(selectionEnd);
-        if (selectionForeground == null) selectionForeground = device.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);
-        if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
+        if (selectionForeground == null) selectionForeground = device.getSystemColor(DWT.COLOR_LIST_SELECTION_TEXT);
+        if (selectionBackground == null) selectionBackground = device.getSystemColor(DWT.COLOR_LIST_SELECTION);
         bool fullSelection = selectionStart == 0 && selectionEnd == length - 1;
         if (fullSelection) {
             if (cairo !is null && OS.GTK_VERSION >= OS.buildVERSION(2, 8, 0)) {
@@ -493,12 +493,12 @@
 
 /**
  * Returns the receiver's horizontal text alignment, which will be one
- * of <code>SWT.LEFT</code>, <code>SWT.CENTER</code> or
- * <code>SWT.RIGHT</code>.
+ * of <code>DWT.LEFT</code>, <code>DWT.CENTER</code> or
+ * <code>DWT.RIGHT</code>.
  *
  * @return the alignment used to positioned text horizontally
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -506,11 +506,11 @@
     checkLayout();
     auto alignment = OS.pango_layout_get_alignment(layout);
     switch ( cast(int)alignment) {
-        case OS.PANGO_ALIGN_CENTER: return SWT.CENTER;
-        case OS.PANGO_ALIGN_RIGHT: return SWT.RIGHT;
+        case OS.PANGO_ALIGN_CENTER: return DWT.CENTER;
+        case OS.PANGO_ALIGN_RIGHT: return DWT.RIGHT;
         default:
     }
-    return SWT.LEFT;
+    return DWT.LEFT;
 }
 
 /**
@@ -518,7 +518,7 @@
  *
  * @return the ascent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -537,7 +537,7 @@
  *
  * @return the bounds of the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -565,7 +565,7 @@
  * @param end the end offset
  * @return the bounds of the character range
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -597,9 +597,9 @@
     */
     PangoRectangle* pangoRect = new PangoRectangle();
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     auto linesRegion = OS.gdk_region_new();
-    if (linesRegion is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (linesRegion is null) DWT.error(DWT.ERROR_NO_HANDLES);
     int lineEnd = 0;
     do {
         OS.pango_layout_iter_get_line_extents(iter, null, pangoRect);
@@ -629,7 +629,7 @@
  *
  * @return the descent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -649,7 +649,7 @@
  *
  * @return the receiver's font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -663,7 +663,7 @@
 *
 * @return the receiver's indent
 *
-* @exception SWTException <ul>
+* @exception DWTException <ul>
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 *
@@ -679,7 +679,7 @@
 *
 * @return the receiver's justification
 *
-* @exception SWTException <ul>
+* @exception DWTException <ul>
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 *
@@ -701,17 +701,17 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the character offset is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  */
 public int getLevel(int offset) {
     checkLayout();
     computeRuns();
     int length = text.length;
-    if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= offset && offset <= length)) DWT.error(DWT.ERROR_INVALID_RANGE);
     offset = translateOffset(offset);
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     int level = 0;
     PangoItem* item = new PangoItem();
     PangoLayoutRun* run = new PangoLayoutRun();
@@ -743,7 +743,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the line index is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -751,9 +751,9 @@
     checkLayout();
     computeRuns();
     int lineCount = OS.pango_layout_get_line_count(layout);
-    if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= lineIndex && lineIndex < lineCount)) DWT.error(DWT.ERROR_INVALID_RANGE);
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
     PangoRectangle* rect = new PangoRectangle();
     OS.pango_layout_iter_get_line_extents(iter, null, rect);
@@ -774,7 +774,7 @@
  *
  * @return the line count
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -794,7 +794,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the character offset is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -802,7 +802,7 @@
     checkLayout ();
     computeRuns();
     int length = text.length;
-    if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (!(0 <= offset && offset <= length)) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     offset = translateOffset(offset);
     int line = 0;
     auto ptr = OS.pango_layout_get_text(layout);
@@ -810,7 +810,7 @@
     int slen = strlen(ptr);
     byteOffset = Math.min(byteOffset, slen);
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     while (OS.pango_layout_iter_next_line(iter)) {
         if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
         line++;
@@ -828,7 +828,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the line index is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -836,7 +836,7 @@
     checkLayout ();
     computeRuns();
     int lineCount = OS.pango_layout_get_line_count(layout);
-    if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= lineIndex && lineIndex < lineCount)) DWT.error(DWT.ERROR_INVALID_RANGE);
     int ascent = 0, descent = 0;
     PangoLayoutLine* line = new PangoLayoutLine();
     memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
@@ -865,7 +865,7 @@
  *
  * @return the line offsets
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -876,7 +876,7 @@
     int[] offsets = new int [lineCount + 1];
     auto ptr = OS.pango_layout_get_text(layout);
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     int i = 0;
     do {
         int bytePos = OS.pango_layout_iter_get_index(iter);
@@ -897,7 +897,7 @@
  * @param trailing the trailing flag
  * @return the location of the character offset
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -908,7 +908,7 @@
     checkLayout();
     computeRuns();
     int length = text.length;
-    if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= offset && offset <= length)) DWT.error(DWT.ERROR_INVALID_RANGE);
     offset = translateOffset(offset);
     auto ptr = OS.pango_layout_get_text(layout);
     int byteOffset = (OS.g_utf8_offset_to_pointer(ptr, offset) - ptr);
@@ -923,9 +923,9 @@
 
 /**
  * Returns the next offset for the specified offset and movement
- * type.  The movement is one of <code>SWT.MOVEMENT_CHAR</code>,
- * <code>SWT.MOVEMENT_CLUSTER</code>, <code>SWT.MOVEMENT_WORD</code>,
- * <code>SWT.MOVEMENT_WORD_END</code> or <code>SWT.MOVEMENT_WORD_START</code>.
+ * type.  The movement is one of <code>DWT.MOVEMENT_CHAR</code>,
+ * <code>DWT.MOVEMENT_CLUSTER</code>, <code>DWT.MOVEMENT_WORD</code>,
+ * <code>DWT.MOVEMENT_WORD_END</code> or <code>DWT.MOVEMENT_WORD_START</code>.
  *
  * @param offset the start offset
  * @param movement the movement type
@@ -934,7 +934,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the offset is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -948,14 +948,14 @@
     checkLayout();
     computeRuns();
     int length = text.length;
-    if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= offset && offset <= length)) DWT.error(DWT.ERROR_INVALID_RANGE);
     if (forward) {
         if (offset == length) return length;
     } else {
         if (offset == 0) return 0;
     }
     int step = forward ? 1 : -1;
-    if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
+    if ((movement & DWT.MOVEMENT_CHAR) != 0) return offset + step;
     PangoLogAttr* attrs;
     int nAttrs;
     OS.pango_layout_get_log_attrs(layout, &attrs, &nAttrs);
@@ -966,18 +966,18 @@
     offset = validateOffset(offset, step);
     while (0 < offset && offset < length) {
         *logAttr = attrs[ offset ];
-        if (((movement & SWT.MOVEMENT_CLUSTER) != 0) && ( logAttr.bitfield0 & (1<<4/*is_cursor_position*/))) break;
-        if ((movement & SWT.MOVEMENT_WORD) != 0) {
+        if (((movement & DWT.MOVEMENT_CLUSTER) != 0) && ( logAttr.bitfield0 & (1<<4/*is_cursor_position*/))) break;
+        if ((movement & DWT.MOVEMENT_WORD) != 0) {
             if (forward) {
                 if (logAttr.bitfield0 & (1<<6/*is_word_end*/)) break;
             } else {
                 if (logAttr.bitfield0 & (1<<5/*is_word_start*/)) break;
             }
         }
-        if ((movement & SWT.MOVEMENT_WORD_START) != 0) {
+        if ((movement & DWT.MOVEMENT_WORD_START) != 0) {
             if (logAttr.bitfield0 & (1<<5/*is_word_start*/)) break;
         }
-        if ((movement & SWT.MOVEMENT_WORD_END) != 0) {
+        if ((movement & DWT.MOVEMENT_WORD_END) != 0) {
             if (logAttr.bitfield0 & (1<<6/*is_word_end*/)) break;
         }
         offset = validateOffset(offset, step);
@@ -1003,7 +1003,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the trailing length is less than <code>1</code></li>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1011,7 +1011,7 @@
  */
 public int getOffset(Point point, int[] trailing) {
     checkLayout();
-    if (point == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (point == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     return getOffset(point.x, point.y, trailing);
 }
 
@@ -1032,7 +1032,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the trailing length is less than <code>1</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1041,17 +1041,17 @@
 public int getOffset(int x, int y, int[] trailing) {
     checkLayout();
     computeRuns();
-    if (trailing != null && trailing.length < 1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (trailing != null && trailing.length < 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 
     /*
     * Feature in GTK.  pango_layout_xy_to_index() returns the
     * logical end/start offset of a line when the coordinates are outside
-    * the line bounds. In SWT the correct behavior is to return the closest
+    * the line bounds. In DWT the correct behavior is to return the closest
     * visual offset. The fix is to clamp the coordinates inside the
     * line bounds.
     */
     auto iter = OS.pango_layout_get_iter(layout);
-    if (iter is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (iter is null) DWT.error(DWT.ERROR_NO_HANDLES);
     PangoRectangle* rect = new PangoRectangle();
     do {
         OS.pango_layout_iter_get_line_extents(iter, null, rect);
@@ -1081,21 +1081,21 @@
  *
  * @return the orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public int getOrientation() {
     checkLayout();
     int baseDir = OS.pango_context_get_base_dir(context);
-    return baseDir == OS.PANGO_DIRECTION_RTL ? SWT.RIGHT_TO_LEFT : SWT.LEFT_TO_RIGHT;
+    return baseDir == OS.PANGO_DIRECTION_RTL ? DWT.RIGHT_TO_LEFT : DWT.LEFT_TO_RIGHT;
 }
 
 /**
  * Returns the previous offset for the specified offset and movement
- * type.  The movement is one of <code>SWT.MOVEMENT_CHAR</code>,
- * <code>SWT.MOVEMENT_CLUSTER</code> or <code>SWT.MOVEMENT_WORD</code>,
- * <code>SWT.MOVEMENT_WORD_END</code> or <code>SWT.MOVEMENT_WORD_START</code>.
+ * type.  The movement is one of <code>DWT.MOVEMENT_CHAR</code>,
+ * <code>DWT.MOVEMENT_CLUSTER</code> or <code>DWT.MOVEMENT_WORD</code>,
+ * <code>DWT.MOVEMENT_WORD_END</code> or <code>DWT.MOVEMENT_WORD_START</code>.
  *
  * @param offset the start offset
  * @param movement the movement type
@@ -1104,7 +1104,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the offset is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1120,7 +1120,7 @@
  * @return the ranges, an array of offsets representing the start and end of each
  * text style.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1151,7 +1151,7 @@
  *
  * @return the text segments offsets
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1172,7 +1172,7 @@
     char[] oldChars = text[0..len].dup;
     char[] newChars = new char[len + nSegments];
     int charCount = 0, segmentCount = 0;
-    wchar separator = getOrientation() == SWT.RIGHT_TO_LEFT ? RTL_MARK : LTR_MARK;
+    wchar separator = getOrientation() == DWT.RIGHT_TO_LEFT ? RTL_MARK : LTR_MARK;
     while (charCount < len) {
         if (segmentCount < nSegments && charCount == segments[segmentCount]) {
             newChars[charCount + segmentCount++] = separator;
@@ -1192,7 +1192,7 @@
  *
  * @return the line spacing
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1210,14 +1210,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the character offset is out of range</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public TextStyle getStyle (int offset) {
     checkLayout();
     int length = text.length;
-    if (!(0 <= offset && offset < length)) SWT.error(SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= offset && offset < length)) DWT.error(DWT.ERROR_INVALID_RANGE);
     for (int i=1; i<styles.length; i++) {
         StyleItem item = styles[i];
         if (item.start > offset) {
@@ -1232,7 +1232,7 @@
  *
  * @return the styles
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1262,7 +1262,7 @@
  *
  * @return the tab list
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1277,7 +1277,7 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1291,7 +1291,7 @@
  *
  * @return the width
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1319,16 +1319,16 @@
 /**
  * Sets the text alignment for the receiver. The alignment controls
  * how a line of text is positioned horizontally. The argument should
- * be one of <code>SWT.LEFT</code>, <code>SWT.RIGHT</code> or <code>SWT.CENTER</code>.
+ * be one of <code>DWT.LEFT</code>, <code>DWT.RIGHT</code> or <code>DWT.CENTER</code>.
  * <p>
- * The default alignment is <code>SWT.LEFT</code>.  Note that the receiver's
- * width must be set in order to use <code>SWT.RIGHT</code> or <code>SWT.CENTER</code>
+ * The default alignment is <code>DWT.LEFT</code>.  Note that the receiver's
+ * width must be set in order to use <code>DWT.RIGHT</code> or <code>DWT.CENTER</code>
  * alignment.
  * </p>
  *
  * @param alignment the new alignment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1336,15 +1336,15 @@
  */
 public void setAlignment (int alignment) {
     checkLayout();
-    int mask = SWT.LEFT | SWT.CENTER | SWT.RIGHT;
+    int mask = DWT.LEFT | DWT.CENTER | DWT.RIGHT;
     alignment &= mask;
     if (alignment == 0) return;
-    if ((alignment & SWT.LEFT) != 0) alignment = SWT.LEFT;
-    if ((alignment & SWT.RIGHT) != 0) alignment = SWT.RIGHT;
+    if ((alignment & DWT.LEFT) != 0) alignment = DWT.LEFT;
+    if ((alignment & DWT.RIGHT) != 0) alignment = DWT.RIGHT;
     int al = OS.PANGO_ALIGN_LEFT;
     switch (alignment) {
-        case SWT.CENTER: al = OS.PANGO_ALIGN_CENTER; break;
-        case SWT.RIGHT: al = OS.PANGO_ALIGN_RIGHT; break;
+        case DWT.CENTER: al = OS.PANGO_ALIGN_CENTER; break;
+        case DWT.RIGHT: al = OS.PANGO_ALIGN_RIGHT; break;
         default:
     }
     OS.pango_layout_set_alignment(layout, al);
@@ -1361,7 +1361,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the ascent is less than <code>-1</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1370,7 +1370,7 @@
  */
 public void setAscent (int ascent) {
     checkLayout();
-    if (ascent < -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (ascent < -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (this.ascent == ascent) return;
     freeRuns();
     this.ascent = ascent;
@@ -1387,7 +1387,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the descent is less than <code>-1</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1396,7 +1396,7 @@
  */
 public void setDescent (int descent) {
     checkLayout();
-    if (descent < -1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (descent < -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (this.descent == descent) return;
     freeRuns();
     this.descent = descent;
@@ -1414,13 +1414,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setFont (Font font) {
     checkLayout ();
-    if (font !is null && font.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (font !is null && font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (this.font is font) return;
     if (font !is null && font == this.font ) return;
     this.font = font;
@@ -1434,7 +1434,7 @@
  *
  * @param indent new indent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1452,7 +1452,7 @@
  *
  * @param justify new justify
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1465,21 +1465,21 @@
 
 /**
  * Sets the orientation of the receiver, which must be one
- * of <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
+ * of <code>DWT.LEFT_TO_RIGHT</code> or <code>DWT.RIGHT_TO_LEFT</code>.
  *
  * @param orientation new orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setOrientation(int orientation) {
     checkLayout();
-    int mask = SWT.RIGHT_TO_LEFT | SWT.LEFT_TO_RIGHT;
+    int mask = DWT.RIGHT_TO_LEFT | DWT.LEFT_TO_RIGHT;
     orientation &= mask;
     if (orientation == 0) return;
-    if ((orientation & SWT.LEFT_TO_RIGHT) != 0) orientation = SWT.LEFT_TO_RIGHT;
-    int baseDir = orientation == SWT.RIGHT_TO_LEFT ? OS.PANGO_DIRECTION_RTL : OS.PANGO_DIRECTION_LTR;
+    if ((orientation & DWT.LEFT_TO_RIGHT) != 0) orientation = DWT.LEFT_TO_RIGHT;
+    int baseDir = orientation == DWT.RIGHT_TO_LEFT ? OS.PANGO_DIRECTION_RTL : OS.PANGO_DIRECTION_LTR;
     if (OS.pango_context_get_base_dir(context) == baseDir) return;
     OS.pango_context_set_base_dir(context, baseDir);
     OS.pango_layout_context_changed(layout);
@@ -1494,13 +1494,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the spacing is negative</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setSpacing (int spacing) {
     checkLayout();
-    if (spacing < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (spacing < 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     OS.pango_layout_set_spacing(layout, spacing * OS.PANGO_SCALE);
 }
 
@@ -1518,7 +1518,7 @@
  *
  * @param segments the text segments offset
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1547,7 +1547,7 @@
  * @param start the start offset
  * @param end the end offset
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1644,7 +1644,7 @@
  *
  * @param tabs the new tab list
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
@@ -1689,13 +1689,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setText (char[] text) {
     checkLayout ();
-    if (text == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (text == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     if (text==/*eq*/this.text) return;
     freeRuns();
     this.text = text;
@@ -1715,7 +1715,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the width is <code>0</code> or less than <code>-1</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -1723,7 +1723,7 @@
  */
 public void setWidth (int width) {
     checkLayout ();
-    if (width < -1 || width == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (width < -1 || width == 0) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     freeRuns();
     OS.pango_layout_set_width(layout, width == -1 ? -1 : width * OS.PANGO_SCALE);
 }
--- a/dwt/graphics/TextStyle.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/TextStyle.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.TextStyle;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Font;
 import dwt.graphics.Color;
 import dwt.graphics.GlyphMetrics;
@@ -91,9 +91,9 @@
  * @param background the background color of the style, <code>null</code> if none
  */
 public this (Font font, Color foreground, Color background) {
-    if (font !is null && font.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
-    if (foreground !is null && foreground.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
-    if (background !is null && background.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+    if (font !is null && font.isDisposed()) DWT.error (DWT.ERROR_INVALID_ARGUMENT);
+    if (foreground !is null && foreground.isDisposed()) DWT.error (DWT.ERROR_INVALID_ARGUMENT);
+    if (background !is null && background.isDisposed()) DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     this.font = font;
     this.foreground = foreground;
     this.background = background;
--- a/dwt/graphics/Transform.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/graphics/Transform.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.graphics.Transform;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.Compatibility;
 import dwt.internal.cairo.Cairo;
 import dwt.graphics.Resource;
@@ -38,9 +38,9 @@
      * the OS resource for the Transform
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -59,10 +59,10 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the Transform could not be obtained</li>
  * </ul>
  *
@@ -88,10 +88,10 @@
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device, or the elements array is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the elements array is too small to hold the matrix values</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the Transform could not be obtained</li>
  * </ul>
  *
@@ -121,10 +121,10 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if device is null and there is no current device</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_NO_GRAPHICS_LIBRARY - if advanced graphics are not available</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle for the Transform could not be obtained</li>
  * </ul>
  *
@@ -132,18 +132,18 @@
  */
 public this (Device device, float m11, float m12, float m21, float m22, float dx, float dy) {
     if (device is null) device = Device.getDevice();
-    if (device is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     this.device = device;
     device.checkCairo();
     handle = new double[6];
-    if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error(DWT.ERROR_NO_HANDLES);
     Cairo.cairo_matrix_init( cast(cairo_matrix_t*)handle.ptr, m11, m12, m21, m22, dx, dy);
     if (device.tracking) device.new_Object(this);
 }
 
 static float[] checkTransform(float[] elements) {
-    if (elements == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (elements.length < 6) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (elements == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (elements.length < 6) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     return elements;
 }
 
@@ -166,7 +166,7 @@
  *
  * @param elements array to hold the matrix values
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  * @exception IllegalArgumentException <ul>
@@ -175,9 +175,9 @@
  * </ul>
  */
 public void getElements(float[] elements) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (elements is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (elements.length < 6) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (elements is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (elements.length < 6) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     elements[0] = cast(float)handle[0];
     elements[1] = cast(float)handle[1];
     elements[2] = cast(float)handle[2];
@@ -190,15 +190,15 @@
  * Modifies the receiver such that the matrix it represents becomes the
  * the mathematical inverse of the matrix it previously represented.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_CANNOT_INVERT_MATRIX - if the matrix is not invertible</li>
  * </ul>
  */
 public void invert() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     if (Cairo.cairo_matrix_invert(cast(cairo_matrix_t*)handle.ptr) != 0) {
-        SWT.error(SWT.ERROR_CANNOT_INVERT_MATRIX);
+        DWT.error(DWT.ERROR_CANNOT_INVERT_MATRIX);
     }
 }
 
@@ -223,7 +223,7 @@
  * @return <code>true</code> if the receiver is an identity Transform, and <code>false</code> otherwise
  */
 public bool isIdentity() {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     float[] m  = new float[6];
     getElements(m);
     return m[0] == 1 && m[1] == 0 && m[2] == 0 && m[3] == 1 && m[4] == 0 && m[5] == 0;
@@ -236,7 +236,7 @@
  *
  * @param matrix the matrix to multiply the receiver by
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  * @exception IllegalArgumentException <ul>
@@ -245,9 +245,9 @@
  * </ul>
  */
 public void multiply(Transform matrix) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (matrix == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-    if (matrix.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (matrix == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (matrix.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     Cairo.cairo_matrix_multiply(cast(cairo_matrix_t*)handle.ptr,cast(cairo_matrix_t*)matrix.handle.ptr, cast(cairo_matrix_t*)handle.ptr);
 }
 
@@ -260,12 +260,12 @@
  *
  * @param angle the angle to rotate the transformation by
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void rotate(float angle) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     Cairo.cairo_matrix_rotate(cast(cairo_matrix_t*)handle.ptr, angle * cast(float)Compatibility.PI / 180);
 }
 
@@ -276,12 +276,12 @@
  * @param scaleX the amount to scale in the X direction
  * @param scaleY the amount to scale in the Y direction
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void scale(float scaleX, float scaleY) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     Cairo.cairo_matrix_scale(cast(cairo_matrix_t*)handle.ptr, scaleX, scaleY);
 }
 
@@ -296,12 +296,12 @@
  * @param dx the third element of the first row of the matrix
  * @param dy the third element of the second row of the matrix
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void setElements(float m11, float m12, float m21, float m22, float dx, float dy) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     Cairo.cairo_matrix_init(cast(cairo_matrix_t*)handle.ptr, m11, m12, m21, m22, dx, dy);
 }
 
@@ -315,13 +315,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point array is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void transform(float[] pointArray) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-    if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    if (pointArray == null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     double dx, dy;
     int length = pointArray.length / 2;
     for (int i = 0, j = 0; i < length; i++, j += 2) {
@@ -340,12 +340,12 @@
  * @param offsetX the distance to translate in the X direction
  * @param offsetY the distance to translate in the Y direction
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void translate(float offsetX, float offsetY) {
-    if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
     Cairo.cairo_matrix_translate(cast(cairo_matrix_t*)handle.ptr, offsetX, offsetY);
 }
 
--- a/dwt/internal/Compatibility.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/Compatibility.d	Tue Jan 15 06:44:34 2008 +0100
@@ -18,7 +18,7 @@
 import java.util.zip.InflaterInputStream;
 +/
 
-import dwt.SWT;
+import dwt.DWT;
 public import dwt.dwthelper.FileInputStream;
 public import dwt.dwthelper.FileOutputStream;
 public import dwt.dwthelper.InflaterInputStream;
@@ -149,7 +149,7 @@
     if (n >= 1 && n <= 30)
         return 2 << (n - 1);
     else if (n != 0) {
-        SWT.error(SWT.ERROR_INVALID_RANGE);
+        DWT.error(DWT.ERROR_INVALID_RANGE);
     }
     return 1;
 }
@@ -267,18 +267,18 @@
 
 /**
  * Returns the NLS'ed message for the given argument. This is only being
- * called from SWT.
+ * called from DWT.
  *
  * @param key the key to look up
  * @return the message for the given key
  *
- * @see SWT#getMessage(String)
+ * @see DWT#getMessage(String)
  */
 public static String getMessage(String key) {
     String answer = key;
 
     if (key == null) {
-        SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        DWT.error (DWT.ERROR_NULL_ARGUMENT);
     }
     if (msgs == null) {
         try {
@@ -299,7 +299,7 @@
     String answer = key;
 
     if (key == null || args == null) {
-        SWT.error (SWT.ERROR_NULL_ARGUMENT);
+        DWT.error (DWT.ERROR_NULL_ARGUMENT);
     }
     if (msgs == null) {
         try {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/internal/DWTEventListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.internal.DWTEventListener;
+
+
+//import java.util.EventListener;
+
+///PORTING_TYPE
+interface EventListener{
+}
+
+/**
+ * This interface is the cross-platform version of the
+ * java.util.EventListener interface.
+ * <p>
+ * It is part of our effort to provide support for both J2SE
+ * and J2ME platforms. Under this scheme, classes need to
+ * implement DWTEventListener instead of java.util.EventListener.
+ * </p>
+ * <p>
+ * Note: java.util.EventListener is not part of CDC and CLDC.
+ * </p>
+ */
+public interface DWTEventListener : EventListener {
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/internal/DWTEventObject.d	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.internal.DWTEventObject;
+
+
+//import java.util.EventObject;
+import tango.core.Exception;
+
+///PORTING_TYPE
+class EventObject {
+  protected Object source;
+
+  public this(Object source) {
+    if (source is null)
+      throw new IllegalArgumentException( "null arg" );
+    this.source = source;
+  }
+
+  public Object getSource() {
+    return source;
+  }
+
+  public override char[] toString() {
+    return this.classinfo.name ~ "[source=" ~ source.toString() ~ "]";
+  }
+}
+
+
+
+
+/**
+ * This class is the cross-platform version of the
+ * java.util.EventObject class.
+ * <p>
+ * It is part of our effort to provide support for both J2SE
+ * and J2ME platforms. Under this scheme, classes need to
+ * extend DWTEventObject instead of java.util.EventObject.
+ * </p>
+ * <p>
+ * Note: java.util.EventObject is not part of CDC and CLDC.
+ * </p>
+ */
+public class DWTEventObject : EventObject {
+
+    //static final long serialVersionUID = 3258125873411470903L;
+
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param source the object which fired the event
+ */
+public this(Object source) {
+    super(source);
+}
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/internal/DWTMessages.properties	Tue Jan 15 06:44:34 2008 +0100
@@ -0,0 +1,73 @@
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+SWT_Yes=Yes
+SWT_No=No
+SWT_OK=OK
+SWT_Cancel=Cancel
+SWT_Abort=Abort
+SWT_Retry=Retry
+SWT_Ignore=Ignore
+SWT_Sample=Sample
+SWT_A_Sample_Text=A Sample Text
+SWT_Selection=Selection
+SWT_Current_Selection=Current Selection
+SWT_Font=Font
+SWT_Color=Color
+SWT_Extended_style=Extended style
+SWT_Size=Size
+SWT_Style=Style
+SWT_Save=Save
+SWT_Character_set=Character set
+SWT_ColorDialog_Title=Colors
+SWT_FontDialog_Title=Fonts
+SWT_FontSet=Font Set
+SWT_NewFont=New Font
+SWT_Remove=Remove
+SWT_Up=Up
+SWT_Down=Down
+SWT_Selection=Selection
+SWT_Charset_Western=western
+SWT_Charset_EastEuropean=eastern
+SWT_Charset_SouthEuropean=southern
+SWT_Charset_NorthEuropean=northern
+SWT_Charset_Cyrillic=cyrillic
+SWT_Charset_Arabic=arabic
+SWT_Charset_Greek=greek
+SWT_Charset_Hebrew=hebrew
+SWT_Charset_Turkish=turkish
+SWT_Charset_Nordic=nordic
+SWT_Charset_Thai=thai
+SWT_Charset_BalticRim=baltic rim
+SWT_Charset_Celtic=celtic
+SWT_Charset_Euro=euro
+SWT_Charset_Romanian=romanian
+SWT_Charset_SimplifiedChinese=simp. chinese
+SWT_Charset_TraditionalChinese=trad. chinese
+SWT_Charset_Japanese=japanese
+SWT_Charset_Korean=korean
+SWT_Charset_Unicode=unicode
+SWT_Charset_ASCII=ASCII
+SWT_InputMethods=Input Methods
+SWT_Password=Password:
+SWT_Username=User Name:
+SWT_Switch=Switch
+SWT_Press=Press
+SWT_Open=Open
+SWT_Close=Close
+SWT_Minimize=Minimize
+SWT_Maximize=Maximize
+SWT_Restore=Restore
+SWT_ShowList=Show List
+SWT_FileDownload=File Download
+SWT_Download_File=Download: {0}
+SWT_Download_Location=Saving {0} from {1}
+SWT_Download_Started=Downloading...
+SWT_Download_Status=Download: {0,number,integer} KB of {1,number,integer} KB
--- a/dwt/internal/Library.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/Library.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,25 +14,25 @@
 
 public class Library {
 
-    /* SWT Version - Mmmm (M=major, mmm=minor) */
+    /* DWT Version - Mmmm (M=major, mmm=minor) */
 
     /**
-     * SWT Major version number (must be >= 0)
+     * DWT Major version number (must be >= 0)
      */
     static const int MAJOR_VERSION = 3;
 
     /**
-     * SWT Minor version number (must be in the range 0..999)
+     * DWT Minor version number (must be in the range 0..999)
      */
     static const int MINOR_VERSION = 346;
 
     /**
-     * SWT revision number (must be >= 0)
+     * DWT revision number (must be >= 0)
      */
     static const int REVISION = 0;
 
     /**
-     * The JAVA and SWT versions
+     * The JAVA and DWT versions
      */
     //public static const int JAVA_VERSION;
     public static /*const*/ int SWT_VERSION;
@@ -88,7 +88,7 @@
 }
 
 /**
- * Returns the SWT version number as an integer.
+ * Returns the DWT version number as an integer.
  *
  * @param major
  * @param minor
@@ -148,12 +148,12 @@
 
 /**
  * Loads the shared library that matches the version of the
- * Java code which is currently running.  SWT shared libraries
+ * Java code which is currently running.  DWT shared libraries
  * follow an encoding scheme where the major, minor and revision
  * numbers are embedded in the library name and this along with
  * <code>name</code> is used to load the library.  If this fails,
  * <code>name</code> is used in another attempt to load the library,
- * this time ignoring the SWT version encoding scheme.
+ * this time ignoring the DWT version encoding scheme.
  *
  * @param name the name of the library to load
  */
@@ -163,12 +163,12 @@
 
 /**
  * Loads the shared library that matches the version of the
- * Java code which is currently running.  SWT shared libraries
+ * Java code which is currently running.  DWT shared libraries
  * follow an encoding scheme where the major, minor and revision
  * numbers are embedded in the library name and this along with
  * <code>name</code> is used to load the library.  If this fails,
  * <code>name</code> is used in another attempt to load the library,
- * this time ignoring the SWT version encoding scheme.
+ * this time ignoring the DWT version encoding scheme.
  *
  * @param name the name of the library to load
  * @param mapName true if the name should be mapped, false otherwise
--- a/dwt/internal/SWTEventListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.internal.SWTEventListener;
-
-
-//import java.util.EventListener;
-
-///PORTING_TYPE
-interface EventListener{
-}
-
-/**
- * This interface is the cross-platform version of the
- * java.util.EventListener interface.
- * <p>
- * It is part of our effort to provide support for both J2SE
- * and J2ME platforms. Under this scheme, classes need to
- * implement SWTEventListener instead of java.util.EventListener.
- * </p>
- * <p>
- * Note: java.util.EventListener is not part of CDC and CLDC.
- * </p>
- */
-public interface SWTEventListener : EventListener {
-}
--- a/dwt/internal/SWTEventObject.d	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-module dwt.internal.SWTEventObject;
-
-
-//import java.util.EventObject;
-import tango.core.Exception;
-
-///PORTING_TYPE
-class EventObject {
-  protected Object source;
-
-  public this(Object source) {
-    if (source is null)
-      throw new IllegalArgumentException( "null arg" );
-    this.source = source;
-  }
-
-  public Object getSource() {
-    return source;
-  }
-
-  public override char[] toString() {
-    return this.classinfo.name ~ "[source=" ~ source.toString() ~ "]";
-  }
-}
-
-
-
-
-/**
- * This class is the cross-platform version of the
- * java.util.EventObject class.
- * <p>
- * It is part of our effort to provide support for both J2SE
- * and J2ME platforms. Under this scheme, classes need to
- * extend SWTEventObject instead of java.util.EventObject.
- * </p>
- * <p>
- * Note: java.util.EventObject is not part of CDC and CLDC.
- * </p>
- */
-public class SWTEventObject : EventObject {
-
-    //static final long serialVersionUID = 3258125873411470903L;
-
-/**
- * Constructs a new instance of this class.
- *
- * @param source the object which fired the event
- */
-public this(Object source) {
-    super(source);
-}
-}
--- a/dwt/internal/SWTMessages.properties	Tue Jan 15 06:38:45 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-SWT_Yes=Yes
-SWT_No=No
-SWT_OK=OK
-SWT_Cancel=Cancel
-SWT_Abort=Abort
-SWT_Retry=Retry
-SWT_Ignore=Ignore
-SWT_Sample=Sample
-SWT_A_Sample_Text=A Sample Text
-SWT_Selection=Selection
-SWT_Current_Selection=Current Selection
-SWT_Font=Font
-SWT_Color=Color
-SWT_Extended_style=Extended style
-SWT_Size=Size
-SWT_Style=Style
-SWT_Save=Save
-SWT_Character_set=Character set
-SWT_ColorDialog_Title=Colors
-SWT_FontDialog_Title=Fonts
-SWT_FontSet=Font Set
-SWT_NewFont=New Font
-SWT_Remove=Remove
-SWT_Up=Up
-SWT_Down=Down
-SWT_Selection=Selection
-SWT_Charset_Western=western
-SWT_Charset_EastEuropean=eastern
-SWT_Charset_SouthEuropean=southern
-SWT_Charset_NorthEuropean=northern
-SWT_Charset_Cyrillic=cyrillic
-SWT_Charset_Arabic=arabic
-SWT_Charset_Greek=greek
-SWT_Charset_Hebrew=hebrew
-SWT_Charset_Turkish=turkish
-SWT_Charset_Nordic=nordic
-SWT_Charset_Thai=thai
-SWT_Charset_BalticRim=baltic rim
-SWT_Charset_Celtic=celtic
-SWT_Charset_Euro=euro
-SWT_Charset_Romanian=romanian
-SWT_Charset_SimplifiedChinese=simp. chinese
-SWT_Charset_TraditionalChinese=trad. chinese
-SWT_Charset_Japanese=japanese
-SWT_Charset_Korean=korean
-SWT_Charset_Unicode=unicode
-SWT_Charset_ASCII=ASCII
-SWT_InputMethods=Input Methods
-SWT_Password=Password:
-SWT_Username=User Name:
-SWT_Switch=Switch
-SWT_Press=Press
-SWT_Open=Open
-SWT_Close=Close
-SWT_Minimize=Minimize
-SWT_Maximize=Maximize
-SWT_Restore=Restore
-SWT_ShowList=Show List
-SWT_FileDownload=File Download
-SWT_Download_File=Download: {0}
-SWT_Download_Location=Saving {0} from {1}
-SWT_Download_Started=Downloading...
-SWT_Download_Status=Download: {0,number,integer} KB of {1,number,integer} KB
--- a/dwt/internal/cairo/Cairo.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/cairo/Cairo.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,7 +14,7 @@
  * Contributor(s):
  *
  * IBM
- * -  Binding to permit interfacing between Cairo and SWT
+ * -  Binding to permit interfacing between Cairo and DWT
  * -  Copyright (C) 2005 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
--- a/dwt/internal/gtk/OS.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
@@ -2293,7 +2293,7 @@
 
     /**************************************************************************
 
-        Utility methods -- conversions of SWT macros
+        Utility methods -- conversions of DWT macros
 
     **************************************************************************/
 
--- a/dwt/internal/image/FileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/FileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -15,7 +15,7 @@
 public import dwt.internal.image.LEDataInputStream;
 public import dwt.internal.image.LEDataOutputStream;
 
-import dwt.SWT;
+import dwt.DWT;
 
 public import dwt.dwthelper.InputStream;
 public import dwt.dwthelper.OutputStream;
@@ -63,10 +63,10 @@
         inputStream = stream;
         return loadFromByteStream();
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
         return null;
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE, e);
+        DWT.error(DWT.ERROR_INVALID_IMAGE, e);
         return null;
     }
 }
@@ -89,7 +89,7 @@
         } catch (TracedException e) {
         }
     }
-    if (!isSupported) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+    if (!isSupported) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
     fileFormat.loader = loader;
     return fileFormat.loadFromStream(stream);
 }
@@ -99,9 +99,9 @@
  * to the specified output stream using the specified file format.
  */
 public static void save(OutputStream os, int format, ImageLoader loader) {
-    if (format < 0 || format >= FORMATS.length) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
-    if (FORMATS[format] == null) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
-    if (loader.data == null || loader.data.length < 1) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (format < 0 || format >= FORMATS.length) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
+    if (FORMATS[format] == null) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
+    if (loader.data == null || loader.data.length < 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 
     LEDataOutputStream stream = new LEDataOutputStream(os);
     FileFormat fileFormat = null;
@@ -112,9 +112,9 @@
             }
         }
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+        DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
     }
-    if (format == SWT.IMAGE_BMP_RLE) {
+    if (format == DWT.IMAGE_BMP_RLE) {
         switch (loader.data[0].depth) {
             case 8: fileFormat.compression = 1; break;
             case 4: fileFormat.compression = 2; break;
@@ -137,7 +137,7 @@
         outputStream.flush();
     } catch (TracedException e) {
         try {outputStream.flush();} catch (Exception f) {}
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 }
--- a/dwt/internal/image/GIFFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/GIFFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -15,7 +15,7 @@
 import dwt.internal.image.LEDataInputStream;
 import dwt.internal.image.LZWCodec;
 import dwt.graphics.RGB;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoaderEvent;
 import dwt.graphics.ImageLoader;
@@ -79,13 +79,13 @@
             inputStream.read(signatureBytes);
             signature = cast(char[])signatureBytes.dup;
             if (signature != "GIF") //$NON-NLS-1$
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
 
             inputStream.read(versionBytes);
 
             inputStream.read(block);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         screenWidth = (block[0] & 0xFF) | ((block[1] & 0xFF) << 8);
         loader.logicalScreenWidth = screenWidth;
@@ -132,7 +132,7 @@
                     inputStream.unread( arr );
                 }
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
             getExtensions();
             id = readID();
@@ -147,7 +147,7 @@
         try {
             return inputStream.read();
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         return -1;
     }
@@ -166,7 +166,7 @@
             if (id == GIF_EXTENSION_BLOCK_ID) {
                 readExtension();
             } else {
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             }
             id = readID();
         }
@@ -176,7 +176,7 @@
                 arr[0] = id;
                 inputStream.unread(arr);
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
         }
     }
@@ -201,13 +201,13 @@
         try {
             int extSize = inputStream.read();
             if (extSize < 0) {
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             }
             byte[] ext = new byte[extSize];
             inputStream.read(ext, 0, extSize);
             return ext;
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -232,7 +232,7 @@
             }
             return comment;
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -263,7 +263,7 @@
             }
             return text;
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -297,7 +297,7 @@
             inputStream.read();
             return controlBlock;
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -338,7 +338,7 @@
             }
             return data;
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -355,7 +355,7 @@
         try {
             inputStream.read(block);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         int left = (block[0] & 0xFF) | ((block[1] & 0xFF) << 8);
         int top = (block[2] & 0xFF) | ((block[3] & 0xFF) << 8);
@@ -393,10 +393,10 @@
         try {
             initialCodeSize = inputStream.read();
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         if (initialCodeSize < 0) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         ImageData image = ImageData.internal_new(
             width,
@@ -410,7 +410,7 @@
             null,
             -1,
             transparentPixel,
-            SWT.IMAGE_GIF,
+            DWT.IMAGE_GIF,
             left,
             top,
             disposalMethod,
@@ -427,9 +427,9 @@
         byte[] bytes = new byte[numColors * 3];
         try {
             if (inputStream.read(bytes) != bytes.length)
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         RGB[] colors = new RGB[numColors];
         for (int i = 0; i < numColors; i++)
@@ -455,15 +455,15 @@
 
         /* Step 2: Check for validity and global/local color map. */
         if (!(depth == 1 || depth == 4 || depth == 8)) {
-            SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+            DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
         }
         for (int i=0; i<frameCount; i++) {
             if (data[i].palette.isDirect) {
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             }
             if (multi) {
                 if (!(data[i].height <= logicalScreenHeight && data[i].width <= logicalScreenWidth && data[i].depth == depth)) {
-                    SWT.error(SWT.ERROR_INVALID_IMAGE);
+                    DWT.error(DWT.ERROR_INVALID_IMAGE);
                 }
                 if (globalTable == 1) {
                     RGB rgbs[] = data[i].palette.getRGBs();
@@ -491,7 +491,7 @@
             outputStream.write(backgroundPixel);
             outputStream.write(0); // Aspect ratio is 1:1
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
 
         /* Step 4: Write Global Color Table if applicable. */
@@ -512,7 +512,7 @@
                 outputStream.writeShort(cast(short) repeatCount);
                 outputStream.write(0); // Block terminator
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
         }
 
@@ -542,7 +542,7 @@
                 block[8] = cast(byte)(globalTable == 0 ? (depth-1) | 0x80 : 0x00);
                 outputStream.write(block);
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
 
             /* Step 8: Write Local Color Table for each frame if applicable. */
@@ -554,7 +554,7 @@
             try {
                 outputStream.write(depth); // Minimum LZW Code size
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
             (new LZWCodec()).encode(outputStream, data[frame]);
         }
@@ -563,7 +563,7 @@
         try {
             outputStream.write(0x3B);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 
@@ -595,7 +595,7 @@
             outputStream.write(gcBlock);
             outputStream.write(0); // Block terminator
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 
@@ -615,7 +615,7 @@
         try {
             outputStream.write(bytes);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 }
--- a/dwt/internal/image/JPEGDecoder.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGDecoder.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.JPEGDecoder;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.dwthelper.InputStream;
 import dwt.internal.image.LEDataInputStream;
 import dwt.graphics.ImageData;
@@ -1999,7 +1999,7 @@
             switch (pass_mode) {
                 case JBUF_PASS_THRU:
                     if (cinfo.quantize_colors) {
-                        error(SWT.ERROR_NOT_IMPLEMENTED);
+                        error(DWT.ERROR_NOT_IMPLEMENTED);
 //                      /* Single-pass processing with color quantization. */
 //                      post.post_process_data = POST_PROCESS_1PASS;
 //                      /* We could be doing buffered-image output before starting a 2-pass
@@ -2278,15 +2278,15 @@
     }
 
 static void error() {
-    SWT.error(SWT.ERROR_INVALID_IMAGE);
+    DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 
 static void error(int code) {
-    SWT.error(code);
+    DWT.error(code);
 }
 
 static void error(char[] msg) {
-    SWT.error(SWT.ERROR_INVALID_IMAGE, null, msg);
+    DWT.error(DWT.ERROR_INVALID_IMAGE, null, msg);
 }
 
 static void jinit_marker_reader (jpeg_decompress_struct cinfo) {
@@ -2687,7 +2687,7 @@
 
     /* Create the quantization buffer, if needed */
     if (cinfo.quantize_colors) {
-        error(SWT.ERROR_NOT_IMPLEMENTED);
+        error(DWT.ERROR_NOT_IMPLEMENTED);
 //      /* The buffer strip height is max_v_samp_factor, which is typically
 //       * an efficient number of rows for upsampling to return.
 //       * (In the presence of output rescaling, we might want to be smarter?)
@@ -3290,7 +3290,7 @@
         cinfo.enable_2pass_quant = false;
     }
     if (cinfo.quantize_colors) {
-        error(SWT.ERROR_NOT_IMPLEMENTED);
+        error(DWT.ERROR_NOT_IMPLEMENTED);
 //      if (cinfo.raw_data_out)
 //          ERREXIT(cinfo, JERR_NOTIMPL);
 //      /* 2-pass quantizer only works in 3-component color space. */
@@ -3490,7 +3490,7 @@
 //      (*cinfo.post.start_pass) (cinfo, JBUF_CRANK_DEST);
 //      (*cinfo.main.start_pass) (cinfo, JBUF_CRANK_DEST);
 //#else
-        error(SWT.ERROR_NOT_IMPLEMENTED);
+        error(DWT.ERROR_NOT_IMPLEMENTED);
 //      ERREXIT(cinfo, JERR_NOT_COMPILED);
 //#endif /* QUANT_2PASS_SUPPORTED */
     } else {
@@ -5373,7 +5373,7 @@
     jpeg_decomp_master master = cinfo.master;
 
     if (cinfo.quantize_colors) {
-        error(SWT.ERROR_NOT_IMPLEMENTED);
+        error(DWT.ERROR_NOT_IMPLEMENTED);
 //      (*cinfo.cquantize.finish_pass) (cinfo);
     }
     master.pass_number++;
@@ -5592,7 +5592,7 @@
         cinfo.bytes_offset = 0;
         cinfo.start_of_file = false;
     } catch (IOException e) {
-        error(SWT.ERROR_IO);
+        error(DWT.ERROR_IO);
         return false;
     }
     return true;
@@ -6363,7 +6363,7 @@
     byte[] data = new byte[row_stride * cinfo.output_height];
     ImageData imageData = ImageData.internal_new(
             cinfo.output_width, cinfo.output_height, palette.isDirect ? 24 : 8, palette, scanlinePad, data,
-            0, null, null, -1, -1, SWT.IMAGE_JPEG, 0, 0, 0, 0);
+            0, null, null, -1, -1, DWT.IMAGE_JPEG, 0, 0, 0, 0);
     if (cinfo.buffered_image) {
         bool done;
         do {
--- a/dwt/internal/image/JPEGFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -9,7 +9,7 @@
  *******************************************************************************/
 module dwt.internal.image.JPEGFileFormat;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.JPEGFrameHeader;
 import dwt.internal.image.JPEGScanHeader;
 import dwt.internal.image.JPEGHuffmanTable;
@@ -349,7 +349,7 @@
             convertMultiRGBToYCbCr(image);
             return;
         default:
-            SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+            DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
     }
     return;
 }
@@ -724,7 +724,7 @@
 }
 void decodeScan() {
     if (progressive && !scanHeader.verifyProgressiveScan()) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     int nComponentsInScan = scanHeader.getNumberOfImageComponents();
     int mcuRowsInScan = interleavedMcuRows;
@@ -775,7 +775,7 @@
 }
 void emit(int huffCode, int nBits) {
     if (nBits == 0) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     int[] power2m1 = [
         1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191,
@@ -1102,7 +1102,7 @@
 void getAPP0() {
     JPEGAppn appn = new JPEGAppn(inputStream);
     if (!appn.verify()) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 }
 void getCOM() {
@@ -1114,7 +1114,7 @@
 void getDHT() {
     JPEGHuffmanTable dht = new JPEGHuffmanTable(inputStream);
     if (!dht.verify()) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     if (acHuffmanTables == null) {
         acHuffmanTables = new JPEGHuffmanTable[4];
@@ -1152,7 +1152,7 @@
 void getDRI() {
     JPEGRestartInterval dri = new JPEGRestartInterval(inputStream);
     if (!dri.verify()) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     restartInterval = dri.getRestartInterval();
 }
@@ -1394,7 +1394,7 @@
         return JPEGDecoder.loadFromByteStream(inputStream, loader);
     }
     JPEGStartOfImage soi = new JPEGStartOfImage(inputStream);
-    if (!soi.verify()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!soi.verify()) DWT.error(DWT.ERROR_INVALID_IMAGE);
     restartInterval = 0;
 
     /* Process the tables preceding the frame header. */
@@ -1402,7 +1402,7 @@
 
     /* Start of Frame. */
     frameHeader = new JPEGFrameHeader(inputStream);
-    if (!frameHeader.verify()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!frameHeader.verify()) DWT.error(DWT.ERROR_INVALID_IMAGE);
     imageWidth = frameHeader.getSamplesPerLine();
     imageHeight = frameHeader.getNumberOfLines();
     maxH = frameHeader.getMaxHFactor();
@@ -1438,7 +1438,7 @@
 
     /* Start of Scan. */
     scanHeader = new JPEGScanHeader(inputStream);
-    if (!scanHeader.verify()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!scanHeader.verify()) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     /* Process scan(s) and further tables until EOI. */
     int progressiveScanCount = 0;
@@ -1461,7 +1461,7 @@
             try {
                 inputStream.unread(unreadBuffer);
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
         }
 
@@ -1471,7 +1471,7 @@
             done = true;
         } else {
             scanHeader = new JPEGScanHeader(inputStream);
-            if (!scanHeader.verify()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+            if (!scanHeader.verify()) DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
     }
 
@@ -1516,7 +1516,7 @@
         null,
         -1,
         -1,
-        SWT.IMAGE_JPEG,
+        DWT.IMAGE_JPEG,
         0,
         0,
         0,
@@ -1564,7 +1564,7 @@
                 getDNL();
                 return 0;
             } else {
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
                 return 0;
             }
         }
@@ -1597,7 +1597,7 @@
         currentByte = dataBuffer[bufferCurrentPosition] & 0xFF;
     }
     if (currentByte != ((RST0 + nextRestartNumber) & 0xFF)) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     bufferCurrentPosition++;
     if (bufferCurrentPosition > 511) {
@@ -1623,7 +1623,7 @@
         int marker = jpegSegment.getSegmentMarker();
         switch (marker) {
             case SOI: // there should only be one SOI per file
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             case EOI:
             case SOS:
                 return jpegSegment;
@@ -1686,7 +1686,7 @@
     try {
         inputStream.read(dataBuffer);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     currentBitCount = 0;
     bufferCurrentPosition = -1;
@@ -1698,7 +1698,7 @@
         try {
             outputStream.write(dataBuffer, 0, bufferCurrentPosition);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
     bufferCurrentPosition = 0;
@@ -1717,7 +1717,7 @@
             }
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return null;
 }
@@ -1737,15 +1737,15 @@
         JPEGSegment jpegSegment = new JPEGSegment(byteArray);
 
         if (byteStream.read(byteArray) != byteArray.length) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         if (!(byteArray[0] == -1 && byteArray[1] != 0 && byteArray[1] != -1)) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         int delta = jpegSegment.getSegmentLength() - 2;
         byteStream.skip(delta);
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 void storeData(int[] dataUnit, int iComp, int xmcu, int ymcu, int hi, int ihi, int vi, int ivi) {
@@ -1771,11 +1771,11 @@
 void unloadIntoByteStream(ImageLoader loader) {
     ImageData image = loader.data[0];
     if (!(new JPEGStartOfImage()).writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     JPEGAppn appn = new JPEGAppn([cast(byte)0xFF, cast(byte)0xE0, 0, 0x10, 0x4A, 0x46, 0x49, 0x46, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0]);
     if (!appn.writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     quantizationTables = new int[][](4);
     JPEGQuantizationTable chromDQT = JPEGQuantizationTable.defaultChrominanceTable();
@@ -1793,10 +1793,10 @@
         quantizationTables[jpegDQTKeys[i]] = jpegDQTValues[i];
     }
     if (!lumDQT.writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     if (!chromDQT.writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     int frameLength, scanLength, precision;
     int[][] frameParams, scanParams;
@@ -1836,7 +1836,7 @@
     frameHeader.componentIdentifiers = [0, 1, 2];
     frameHeader.initializeContents();
     if (!frameHeader.writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     frameComponents = frameParams;
     componentIds = frameHeader.componentIdentifiers;
@@ -1857,7 +1857,7 @@
     for (int i = 0; i < dhtTables.length; i++) {
         JPEGHuffmanTable dhtTable = dhtTables[i];
         if (!dhtTable.writeToStream(outputStream)) {
-            SWT.error(SWT.ERROR_IO);
+            DWT.error(DWT.ERROR_IO);
         }
         JPEGHuffmanTable[] allTables = dhtTable.getAllTables();
         for (int j = 0; j < allTables.length; j++) {
@@ -1879,7 +1879,7 @@
     scanHeader.componentParameters = scanParams;
     scanHeader.initializeContents();
     if (!scanHeader.writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
     convertImageToYCbCr(image);
     resetOutputBuffer();
@@ -1887,7 +1887,7 @@
     currentBitCount = 0;
     encodeScan();
     if (!(new JPEGEndOfImage()).writeToStream(outputStream)) {
-        SWT.error(SWT.ERROR_IO);
+        DWT.error(DWT.ERROR_IO);
     }
 }
 }
--- a/dwt/internal/image/JPEGFixedSizeSegment.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGFixedSizeSegment.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.JPEGFixedSizeSegment;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.JPEGSegment;
 import dwt.internal.image.LEDataInputStream;
 
@@ -34,7 +34,7 @@
         try {
             byteStream.read(reference);
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 
--- a/dwt/internal/image/JPEGFrameHeader.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGFrameHeader.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.JPEGFrameHeader;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.JPEGVariableSizeSegment;
 import dwt.internal.image.JPEGFileFormat;
 import dwt.internal.image.LEDataInputStream;
@@ -135,7 +135,7 @@
     public void initializeContents() {
         int nf = getNumberOfImageComponents();
         if (nf == 0 || nf != componentParameters.length) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         int hmax = 0;
         int vmax = 0;
@@ -146,7 +146,7 @@
             int hi = compParam[1];
             int vi = compParam[2];
             if (hi * vi > 4) {
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             }
             reference[ofs] = cast(byte)(i + 1);
             reference[ofs + 1] = cast(byte)(hi * 16 + vi);
--- a/dwt/internal/image/JPEGScanHeader.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGScanHeader.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.JPEGScanHeader;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.JPEGVariableSizeSegment;
 import dwt.internal.image.LEDataInputStream;
 import dwt.internal.image.JPEGFileFormat;
@@ -70,7 +70,7 @@
     int compCount = getNumberOfImageComponents();
     int[][] compSpecParams = componentParameters;
     if (compCount == 0 || compCount != compSpecParams.length) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     for (int i = 0; i < compCount; i++) {
         int ofs = i * 2 + 5;
--- a/dwt/internal/image/JPEGVariableSizeSegment.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/JPEGVariableSizeSegment.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.JPEGVariableSizeSegment;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.JPEGSegment;
 import dwt.internal.image.LEDataInputStream;
 
@@ -35,7 +35,7 @@
             byteStream.read(contents, 4, contents.length - 4);
             reference = contents;
         } catch (TracedException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 }
--- a/dwt/internal/image/LZWCodec.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/LZWCodec.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,7 +14,7 @@
 import dwt.internal.image.LZWNode;
 import dwt.internal.image.LEDataInputStream;
 import dwt.internal.image.LEDataOutputStream;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoader;
 import dwt.graphics.ImageLoaderEvent;
@@ -458,15 +458,15 @@
     try {
         size = inputStream.read();
         if (size == -1) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         block[0] = cast(byte)size;
         size = inputStream.read(block, 1, size);
         if (size == -1) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return size;
 }
@@ -478,7 +478,7 @@
     try {
         outputStream.write(block, 0, (block[0] & 0xFF) + 1);
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 }
--- a/dwt/internal/image/OS2BMPFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/OS2BMPFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.OS2BMPFileFormat;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoader;
 import dwt.graphics.PaletteData;
@@ -49,9 +49,9 @@
     byte[] data = new byte[dataSize];
     try {
         if (inputStream.read(data) != dataSize)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return data;
 }
@@ -64,10 +64,10 @@
         header[3] = inputStream.readShort();
         header[4] = inputStream.readInt();
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     if (header[0] != 0x4D42)
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     return header;
 }
 ImageData[] loadFromByteStream() {
@@ -76,7 +76,7 @@
     try {
         inputStream.read(infoHeader);
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     width = (infoHeader[4] & 0xFF) | ((infoHeader[5] & 0xFF) << 8);
     height = (infoHeader[6] & 0xFF) | ((infoHeader[7] & 0xFF) << 8);
@@ -87,11 +87,11 @@
         try {
             inputStream.skip(fileHeader[4] - inputStream.getPosition());
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
     byte[] data = loadData(infoHeader);
-    int type = SWT.IMAGE_OS2_BMP;
+    int type = DWT.IMAGE_OS2_BMP;
     return [
         ImageData.internal_new(
             width,
@@ -118,9 +118,9 @@
         byte[] buf = new byte[numColors * 3];
         try {
             if (inputStream.read(buf) != buf.length)
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         return paletteFromBytes(buf, numColors);
     }
@@ -199,7 +199,7 @@
             }
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return bmpBpl * image.height;
 }
@@ -213,16 +213,16 @@
     int numCols;
     if (!((image.depth == 1) || (image.depth == 4) || (image.depth == 8) ||
           (image.depth == 16) || (image.depth == 24) || (image.depth == 32)))
-            SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+            DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
     PaletteData pal = image.palette;
     if ((image.depth == 16) || (image.depth == 24) || (image.depth == 32)) {
         if (!pal.isDirect)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         numCols = 0;
         rgbs = null;
     } else {
         if (pal.isDirect)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         numCols = pal.colors.length;
         rgbs = paletteToBytes(pal);
     }
@@ -255,7 +255,7 @@
         outputStream.writeShort(fileHeader[3]);
         outputStream.writeInt(fileHeader[4]);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     try {
         outputStream.writeInt(BMPHeaderFixedSize);
@@ -264,7 +264,7 @@
         outputStream.writeShort(1);
         outputStream.writeShort(cast(short)image.depth);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 
     // Unload palette
@@ -272,7 +272,7 @@
         try {
             outputStream.write(rgbs);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 
@@ -280,7 +280,7 @@
     try {
         outputStream.write(data);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 void flipScanLines(byte[] data, int stride, int height) {
--- a/dwt/internal/image/PNGFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PNGFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PNGFileFormat;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoaderEvent;
 import dwt.graphics.ImageLoader;
@@ -61,7 +61,7 @@
         PngChunkReader chunkReader = new PngChunkReader(inputStream);
         headerChunk = chunkReader.getIhdrChunk();
         int width = headerChunk.getWidth(), height = headerChunk.getHeight();
-        if (width <= 0 || height <= 0) SWT.error(SWT.ERROR_INVALID_IMAGE);
+        if (width <= 0 || height <= 0) DWT.error(DWT.ERROR_INVALID_IMAGE);
         int imageSize = getAlignedBytesPerRow() * height;
         data = new byte[imageSize];
         imageData = ImageData.internal_new(
@@ -76,7 +76,7 @@
             null,
             -1,
             -1,
-            SWT.IMAGE_PNG,
+            DWT.IMAGE_PNG,
             0,
             0,
             0,
@@ -93,7 +93,7 @@
 
         return [imageData];
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
         return null;
     }
 }
@@ -142,7 +142,7 @@
                 // sequential. If the pixel data has already
                 // been read and another IDAT block is encountered,
                 // then this is an invalid image.
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
             } else {
                 // Read in the pixel data for the image. This should
                 // go through all the image's IDAT chunks.
@@ -153,7 +153,7 @@
         default:
             if (chunk.isCritical()) {
                 // All critical chunks must be supported.
-                SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
+                DWT.error(DWT.ERROR_NOT_IMPLEMENTED);
             }
     }
 }
@@ -180,7 +180,7 @@
     }
 }
 /**
- * SWT does not support 16-bit depths. If this image uses
+ * DWT does not support 16-bit depths. If this image uses
  * 16-bit depths, convert the data to an 8-bit depth.
  */
 byte[] validateBitDepth(byte[] data) {
@@ -193,7 +193,7 @@
     }
 }
 /**
- * SWT does not support greyscale as a color type. For
+ * DWT does not support greyscale as a color type. For
  * plain grayscale, we create a palette. For Grayscale
  * with Alpha, however, we need to convert the pixels
  * to use RGB values.
@@ -291,9 +291,9 @@
 }
 /**
  * PNG supports some color types and bit depths that are
- * unsupported by SWT. If the image uses an unsupported
+ * unsupported by DWT. If the image uses an unsupported
  * color type (either of the gray scale types) or bit
- * depth (16), convert the data to an SWT-supported
+ * depth (16), convert the data to an DWT-supported
  * format. Then assign the data into the ImageData given.
  */
 void setImageDataValues(byte[] data, ImageData imageData) {
@@ -491,7 +491,7 @@
     setImageDataValues(data, imageData);
 }
 /**
- * SWT does not support 16-bit depth color formats.
+ * DWT does not support 16-bit depth color formats.
  * Convert the 16-bit data to 8-bit data.
  * The correct way to do this is to multiply each
  * 16 bit value by the value:
@@ -517,7 +517,7 @@
     }
 }
 /**
- * SWT does not support 16-bit depth color formats.
+ * DWT does not support 16-bit depth color formats.
  * Convert the 16-bit data to 8-bit data.
  * The correct way to do this is to multiply each
  * 16 bit value by the value:
--- a/dwt/internal/image/PngChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngChunk;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.LEDataInputStream;
 import dwt.internal.image.PngFileReadState;
 import dwt.internal.image.PngIhdrChunk;
@@ -72,7 +72,7 @@
  */
 this(byte[] reference) {
     setReference(reference);
-    if (reference.length < LENGTH_OFFSET + LENGTH_FIELD_LENGTH) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (reference.length < LENGTH_OFFSET + LENGTH_FIELD_LENGTH) DWT.error(DWT.ERROR_INVALID_IMAGE);
     length = getInt32(LENGTH_OFFSET);
 }
 
@@ -186,7 +186,7 @@
  */
 void setType(byte[] value) {
     if (value.length != TYPE_FIELD_LENGTH) {
-        SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+        DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     }
     System.arraycopy(value, 0, reference, TYPE_OFFSET, TYPE_FIELD_LENGTH);
 }
@@ -197,7 +197,7 @@
 byte[] getData() {
     int dataLength = getLength();
     if (reference.length < MIN_LENGTH + dataLength) {
-        SWT.error (SWT.ERROR_INVALID_RANGE);
+        DWT.error (DWT.ERROR_INVALID_RANGE);
     }
     byte[] data = new byte[dataLength];
     System.arraycopy(reference, DATA_OFFSET, data, 0, dataLength);
@@ -335,24 +335,24 @@
  * Answer whether the chunk is a valid PNG chunk.
  */
 void validate(PngFileReadState readState, PngIhdrChunk headerChunk) {
-    if (reference.length < MIN_LENGTH) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (reference.length < MIN_LENGTH) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     byte[] type = getTypeBytes();
 
     // The third character MUST be upper case.
     char c = cast(char) type[2];
-    if (!('A' <= c && c <= 'Z')) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!('A' <= c && c <= 'Z')) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     // All characters must be letters.
     for (int i = 0; i < TYPE_FIELD_LENGTH; i++) {
         c = cast(char) type[i];
         if (!(('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
     }
 
     // The stored CRC must match the data's computed CRC.
-    if (!checkCRC()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!checkCRC()) DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 
 /**
--- a/dwt/internal/image/PngChunkReader.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngChunkReader.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngChunkReader;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.LEDataInputStream;
 import dwt.internal.image.PngFileReadState;
 import dwt.internal.image.PngIhdrChunk;
@@ -34,12 +34,12 @@
 PngIhdrChunk getIhdrChunk() {
     if (headerChunk is null) {
         PngChunk chunk = PngChunk.readNextFromStream(inputStream);
-        if (chunk is null) SWT.error(SWT.ERROR_INVALID_IMAGE);
+        if (chunk is null) DWT.error(DWT.ERROR_INVALID_IMAGE);
         if(( headerChunk = cast(PngIhdrChunk) chunk ) !is null ){
             headerChunk.validate(readState, null);
         }
         else{
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
     }
     return headerChunk;
@@ -49,7 +49,7 @@
     if (headerChunk is null) return getIhdrChunk();
 
     PngChunk chunk = PngChunk.readNextFromStream(inputStream);
-    if (chunk is null) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (chunk is null) DWT.error(DWT.ERROR_INVALID_IMAGE);
     switch (chunk.getChunkType()) {
         case PngChunk.CHUNK_tRNS:
             (cast(PngTrnsChunk) chunk).validate(readState, headerChunk, paletteChunk);
--- a/dwt/internal/image/PngDecodingDataStream.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngDecodingDataStream.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 
 import dwt.dwthelper.InputStream;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.PngLzBlockReader;
 
 public class PngDecodingDataStream : InputStream {
@@ -101,7 +101,7 @@
 }
 
 void error() {
-    SWT.error(SWT.ERROR_INVALID_IMAGE);
+    DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 
 private void readCompressedDataHeader() {
--- a/dwt/internal/image/PngEncoder.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngEncoder.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 import dwt.internal.image.LEDataOutputStream;
 import dwt.internal.image.PngDeflater;
 import dwt.dwthelper.ByteArrayOutputStream;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoader;
 import dwt.graphics.RGB;
@@ -57,7 +57,7 @@
     this.colorType = 2;
 
     if (data.palette.isDirect) {
-        if (transparencyType == SWT.TRANSPARENCY_ALPHA) {
+        if (transparencyType == DWT.TRANSPARENCY_ALPHA) {
             this.colorType = 6;
         }
     }
@@ -65,7 +65,7 @@
         this.colorType = 3;
     }
 
-    if (!(colorType == 2 || colorType == 3 || colorType == 6)) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!(colorType == 2 || colorType == 3 || colorType == 6)) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
 }
 
@@ -135,7 +135,7 @@
 
     RGB[] RGBs = data.palette.getRGBs();
 
-    if (RGBs.length > 256) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (RGBs.length > 256) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     ByteArrayOutputStream baos = new ByteArrayOutputStream(RGBs.length);
 
@@ -157,7 +157,7 @@
 
     switch (transparencyType) {
 
-        case SWT.TRANSPARENCY_ALPHA:
+        case DWT.TRANSPARENCY_ALPHA:
 
             int pixelValue, alphaValue;
 
@@ -180,7 +180,7 @@
 
             break;
 
-        case SWT.TRANSPARENCY_PIXEL:
+        case DWT.TRANSPARENCY_PIXEL:
 
             int pixel = data.transparentPixel;
 
@@ -330,8 +330,8 @@
             writePalette();
         }
 
-        bool transparencyAlpha = (transparencyType == SWT.TRANSPARENCY_ALPHA);
-        bool transparencyPixel = (transparencyType == SWT.TRANSPARENCY_PIXEL);
+        bool transparencyAlpha = (transparencyType == DWT.TRANSPARENCY_ALPHA);
+        bool transparencyPixel = (transparencyType == DWT.TRANSPARENCY_PIXEL);
         bool type2Transparency = (colorType == 2 && transparencyPixel);
         bool type3Transparency = (colorType == 3 && (transparencyAlpha || transparencyPixel));
 
@@ -348,7 +348,7 @@
 
     catch (IOException e) {
 
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
 
     }
 
--- a/dwt/internal/image/PngIdatChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngIdatChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngIdatChunk;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.PngFileReadState;
 import dwt.internal.image.PngIhdrChunk;
 import dwt.internal.image.PngChunk;
@@ -50,7 +50,7 @@
         || (headerChunk.getMustHavePalette() && !readState.readPLTE)
         || readState.readIEND)
     {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     } else {
         readState.readIDAT = true;
     }
--- a/dwt/internal/image/PngIendChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngIendChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngIendChunk;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.image.PngFileReadState;
 import dwt.internal.image.PngIhdrChunk;
 import dwt.internal.image.PngChunk;
@@ -44,7 +44,7 @@
         || !readState.readIDAT
         || readState.readIEND)
     {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     } else {
         readState.readIEND = true;
     }
@@ -52,7 +52,7 @@
     super.validate(readState, headerChunk);
 
     // IEND chunks are not allowed to have any data.
-    if (getLength() > 0) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (getLength() > 0) DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 
 }
--- a/dwt/internal/image/PngIhdrChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngIhdrChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngIhdrChunk;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.PaletteData;
 import dwt.graphics.RGB;
 import dwt.internal.image.PngFileReadState;
@@ -70,7 +70,7 @@
  */
 this(byte[] reference) {
     super(reference);
-    if (reference.length <= IHDR_DATA_LENGTH) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (reference.length <= IHDR_DATA_LENGTH) DWT.error(DWT.ERROR_INVALID_IMAGE);
     width = getInt32(WIDTH_DATA_OFFSET);
     height = getInt32(HEIGHT_DATA_OFFSET);
     bitDepth = reference[BIT_DEPTH_OFFSET];
@@ -224,18 +224,18 @@
         || readState.readIDAT
         || readState.readIEND)
     {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     } else {
         readState.readIHDR = true;
     }
 
     super.validate(readState, headerChunk);
 
-    if (length != IHDR_DATA_LENGTH) SWT.error(SWT.ERROR_INVALID_IMAGE);
-    if (compressionMethod != 0) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (length != IHDR_DATA_LENGTH) DWT.error(DWT.ERROR_INVALID_IMAGE);
+    if (compressionMethod != 0) DWT.error(DWT.ERROR_INVALID_IMAGE);
     if (interlaceMethod != INTERLACE_METHOD_NONE &&
         interlaceMethod != INTERLACE_METHOD_ADAM7) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 
     bool colorTypeIsValid = false;
@@ -245,7 +245,7 @@
             break;
         }
     }
-    if (!colorTypeIsValid) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!colorTypeIsValid) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     bool bitDepthIsValid = false;
     for (int i = 0; i < ValidBitDepths.length; i++) {
@@ -254,18 +254,18 @@
             break;
         }
     }
-    if (!bitDepthIsValid) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (!bitDepthIsValid) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     if ((colorType == COLOR_TYPE_RGB
         || colorType == COLOR_TYPE_RGB_WITH_ALPHA
         || colorType == COLOR_TYPE_GRAYSCALE_WITH_ALPHA)
         && bitDepth < 8)
     {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 
     if (colorType == COLOR_TYPE_PALETTE && bitDepth > 8) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 }
 
@@ -329,7 +329,7 @@
         case COLOR_TYPE_PALETTE:
             return bitDepth;
         default:
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
             return 0;
     }
 }
@@ -348,7 +348,7 @@
         case COLOR_TYPE_PALETTE:
             return Math.min(bitDepth, 8);
         default:
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
             return 0;
     }
 }
--- a/dwt/internal/image/PngPlteChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngPlteChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.internal.image.PngPlteChunk;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.PaletteData;
 import dwt.graphics.RGB;
 import dwt.internal.image.PngChunk;
@@ -94,7 +94,7 @@
         || readState.readIDAT
         || readState.readIEND)
     {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     } else {
         readState.readPLTE = true;
     }
@@ -104,21 +104,21 @@
     // Palettes cannot be included in grayscale images.
     //
     // Note: just ignore the palette.
-//  if (!headerChunk.getCanHavePalette()) SWT.error(SWT.ERROR_INVALID_IMAGE);
+//  if (!headerChunk.getCanHavePalette()) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     // Palette chunks' data fields must be event multiples
     // of 3. Each 3-byte group represents an RGB value.
-    if (getLength() % 3 != 0) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (getLength() % 3 != 0) DWT.error(DWT.ERROR_INVALID_IMAGE);
 
     // Palettes cannot have more entries than 2^bitDepth
     // where bitDepth is the bit depth of the image given
     // in the IHDR chunk.
     if (1 << headerChunk.getBitDepth() < paletteSize) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 
     // Palettes cannot have more than 256 entries.
-    if (256 < paletteSize) SWT.error(SWT.ERROR_INVALID_IMAGE);
+    if (256 < paletteSize) DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 
 override char[] contributeToString() {
--- a/dwt/internal/image/PngTrnsChunk.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/PngTrnsChunk.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.PngTrnsChunk;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.PaletteData;
 import dwt.graphics.RGB;
 import dwt.internal.image.PngChunk;
@@ -63,7 +63,7 @@
             valid = false;
     }
     if (!valid) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 }
 
@@ -76,7 +76,7 @@
         || readState.readIDAT
         || readState.readIEND)
     {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     } else {
         readState.readTRNS = true;
     }
@@ -126,7 +126,7 @@
             }
             return (red << 16) | (green << 8) | blue;
         default:
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
             return -1;
     }
 }
@@ -138,7 +138,7 @@
  */
 byte[] getAlphaValues(PngIhdrChunk header, PngPlteChunk paletteChunk) {
     if (header.getColorType() != PngIhdrChunk.COLOR_TYPE_PALETTE) {
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
     byte[] alphas = new byte[paletteChunk.getPaletteSize()];
     int dataLength = getLength();
--- a/dwt/internal/image/TIFFDirectory.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/TIFFDirectory.d	Tue Jan 15 06:44:34 2008 +0100
@@ -18,7 +18,7 @@
 import dwt.graphics.ImageLoader;
 import dwt.graphics.PaletteData;
 import dwt.graphics.RGB;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.dwthelper.Integer;
 
 //PORTING_TYPE
@@ -129,7 +129,7 @@
         case TYPE_RATIONAL: size = 8; break;
         case TYPE_ASCII:
         case TYPE_BYTE: size = 1; break;
-        default: SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT); return;
+        default: DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT); return;
     }
     if (values.length * size > 4) {
         buffer = new byte[values.length * size];
@@ -182,7 +182,7 @@
     file.read(buffer);
     RGB[] colors = new RGB[numColors];
     /**
-     * SWT does not support 16-bit depth color formats.
+     * DWT does not support 16-bit depth color formats.
      * Convert the 16-bit data to 8-bit data.
      * The correct way to do this is to multiply each
      * 16 bit value by the value:
@@ -317,7 +317,7 @@
                 break;
             }
             case TAG_BitsPerSample: {
-                if (type != TYPE_SHORT) SWT.error(SWT.ERROR_INVALID_IMAGE);
+                if (type != TYPE_SHORT) DWT.error(DWT.ERROR_INVALID_IMAGE);
                 bitsPerSample = new int[count];
                 getEntryValue(type, buffer, offset, bitsPerSample);
                 break;
@@ -331,16 +331,16 @@
                 break;
             }
             case TAG_StripOffsets: {
-                if (type != TYPE_LONG && type != TYPE_SHORT) SWT.error(SWT.ERROR_INVALID_IMAGE);
+                if (type != TYPE_LONG && type != TYPE_SHORT) DWT.error(DWT.ERROR_INVALID_IMAGE);
                 stripOffsets = new int[count];
                 getEntryValue(type, buffer, offset, stripOffsets);
                 break;
             }
             case TAG_SamplesPerPixel: {
-                if (type != TYPE_SHORT) SWT.error(SWT.ERROR_INVALID_IMAGE);
+                if (type != TYPE_SHORT) DWT.error(DWT.ERROR_INVALID_IMAGE);
                 samplesPerPixel = getEntryValue(type, buffer, offset);
                 /* Only the basic 1 and 3 values are supported */
-                if (samplesPerPixel != 1 && samplesPerPixel != 3) SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+                if (samplesPerPixel != 1 && samplesPerPixel != 3) DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
                 break;
             }
             case TAG_RowsPerStrip: {
@@ -361,11 +361,11 @@
                 break;
             }
             case TAG_T4Options: {
-                if (type != TYPE_LONG) SWT.error(SWT.ERROR_INVALID_IMAGE);
+                if (type != TYPE_LONG) DWT.error(DWT.ERROR_INVALID_IMAGE);
                 t4Options = getEntryValue(type, buffer, offset);
                 if ((t4Options & 0x1) == 1) {
                     /* 2-dimensional coding is not supported */
-                    SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+                    DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
                 }
                 break;
             }
@@ -374,7 +374,7 @@
                 break;
             }
             case TAG_ColorMap: {
-                if (type != TYPE_SHORT) SWT.error(SWT.ERROR_INVALID_IMAGE);
+                if (type != TYPE_SHORT) DWT.error(DWT.ERROR_INVALID_IMAGE);
                 /* Get the offset of the colorMap (use TYPE_LONG) */
                 colorMapOffset = getEntryValue(TYPE_LONG, buffer, offset);
                 break;
@@ -416,7 +416,7 @@
         }
         case 2: {
             /* RGB image */
-            if (colorMapOffset != NO_VALUE) SWT.error(SWT.ERROR_INVALID_IMAGE);
+            if (colorMapOffset != NO_VALUE) DWT.error(DWT.ERROR_INVALID_IMAGE);
             /* SamplesPerPixel 3 is the only value supported */
             palette = getRGBPalette(bitsPerSample[0], bitsPerSample[1], bitsPerSample[2]);
             depth = bitsPerSample[0] + bitsPerSample[1] + bitsPerSample[2];
@@ -424,13 +424,13 @@
         }
         case 3: {
             /* Palette Color image */
-            if (colorMapOffset == NO_VALUE) SWT.error(SWT.ERROR_INVALID_IMAGE);
+            if (colorMapOffset == NO_VALUE) DWT.error(DWT.ERROR_INVALID_IMAGE);
             palette = getColorMap();
             depth = bitsPerSample[0];
             break;
         }
         default: {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
     }
 
@@ -446,7 +446,7 @@
             null,
             -1,
             -1,
-            SWT.IMAGE_TIFF,
+            DWT.IMAGE_TIFF,
             0,
             0,
             0,
@@ -467,7 +467,7 @@
         (buffer[i + 1] & 0xFF) | ((buffer[i] & 0xFF) << 8);
     }
     /* Invalid type */
-    SWT.error(SWT.ERROR_INVALID_IMAGE);
+    DWT.error(DWT.ERROR_INVALID_IMAGE);
     return -1;
 }
 
@@ -494,7 +494,7 @@
         RGB[] rgbs = palette.getRGBs();
         colorMap = formatColorMap(rgbs);
         /* The number of entries of the Color Map must match the bitsPerSample field */
-        if (colorMap.length != 3 * 1 << image.depth) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+        if (colorMap.length != 3 * 1 << image.depth) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
         /* Extra space used by ColorMap values */
         extraBytes += colorMap.length * 2;
     }
@@ -598,19 +598,19 @@
     int photometricInterpretation = -1;
 
     /* Scanline pad must be 1 */
-    if (image.scanlinePad != 1) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+    if (image.scanlinePad != 1) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
     switch (image.depth) {
         case 1: {
             /* Palette must be black and white or white and black */
             PaletteData palette = image.palette;
             RGB[] rgbs = palette.colors;
-            if (palette.isDirect || rgbs == null || rgbs.length != 2) SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+            if (palette.isDirect || rgbs == null || rgbs.length != 2) DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
             RGB rgb0 = rgbs[0];
             RGB rgb1 = rgbs[1];
             if (!(rgb0.red == rgb0.green && rgb0.green == rgb0.blue &&
                 rgb1.red == rgb1.green && rgb1.green == rgb1.blue &&
                 ((rgb0.red == 0x0 && rgb1.red == 0xFF) || (rgb0.red == 0xFF && rgb1.red == 0x0)))) {
-                SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+                DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
             }
             /* 0 means a color index of 0 is imaged as white */
             photometricInterpretation = image.palette.colors[0].red == 0xFF ? 0 : 1;
@@ -626,7 +626,7 @@
             break;
         }
         default: {
-            SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT);
+            DWT.error(DWT.ERROR_UNSUPPORTED_FORMAT);
         }
     }
     write(photometricInterpretation);
--- a/dwt/internal/image/TIFFFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/TIFFFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 import dwt.internal.image.TIFFRandomFileAccess;
 import dwt.internal.image.TIFFDirectory;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.ImageData;
 import dwt.graphics.ImageLoader;
 import dwt.internal.image.FileFormat;
@@ -48,10 +48,10 @@
     TIFFRandomFileAccess file = new TIFFRandomFileAccess(inputStream);
     try {
         file.read(header);
-        if (header[0] != header[1]) SWT.error(SWT.ERROR_INVALID_IMAGE);
+        if (header[0] != header[1]) DWT.error(DWT.ERROR_INVALID_IMAGE);
         if (!(header[0] == 0x49 && header[2] == 42 && header[3] == 0) &&
             !(header[0] == 0x4d && header[2] == 0 && header[3] == 42)) {
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         }
         isLittleEndian = header[0] == 0x49;
         int offset = isLittleEndian ?
@@ -63,7 +63,7 @@
         /* A baseline reader is only expected to read the first directory */
         images = [image];
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return images;
 }
@@ -76,7 +76,7 @@
     try {
         directory.writeToStream(outputStream);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 
--- a/dwt/internal/image/TIFFModifiedHuffmanCodec.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/TIFFModifiedHuffmanCodec.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.internal.image.TIFFModifiedHuffmanCodec;
 
-import dwt.SWT;
+import dwt.DWT;
 
 /*
 * Decoder for
@@ -166,7 +166,7 @@
             if (found) break;
             code = code << 1 | getNextBit();
         }
-        if (!found) SWT.error(SWT.ERROR_INVALID_IMAGE);
+        if (!found) DWT.error(DWT.ERROR_INVALID_IMAGE);
     }
 }
 
--- a/dwt/internal/image/WinBMPFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/WinBMPFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -15,7 +15,7 @@
 import dwt.graphics.Point;
 import dwt.graphics.RGB;
 import dwt.dwthelper.ByteArrayOutputStream;
-import dwt.SWT;
+import dwt.DWT;
 
 import tango.core.Exception;
 
@@ -43,7 +43,7 @@
     if (comp == 2) { // BMP_RLE4_COMPRESSION
         return compressRLE4Data(src, srcOffset, numBytes, dest, last);
     }
-    SWT.error(SWT.ERROR_INVALID_IMAGE);
+    DWT.error(DWT.ERROR_INVALID_IMAGE);
     return 0;
 }
 int compressRLE4Data(byte[] src, int srcOffset, int numBytes, byte[] dest, bool last) {
@@ -193,15 +193,15 @@
 void decompressData(byte[] src, byte[] dest, int stride, int cmp) {
     if (cmp == 1) { // BMP_RLE8_COMPRESSION
         if (decompressRLE8Data(src, src.length, stride, dest, dest.length) <= 0)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         return;
     }
     if (cmp == 2) { // BMP_RLE4_COMPRESSION
         if (decompressRLE4Data(src, src.length, stride, dest, dest.length) <= 0)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         return;
     }
-    SWT.error(SWT.ERROR_INVALID_IMAGE);
+    DWT.error(DWT.ERROR_INVALID_IMAGE);
 }
 int decompressRLE4Data(byte[] src, int numBytes, int stride, byte[] dest, int destSize) {
     int sp = 0;
@@ -359,18 +359,18 @@
     if (cmp == 0 || cmp == 3) { // BMP_NO_COMPRESSION
         try {
             if (inputStream.read(data) != dataSize)
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     } else {
         int compressedSize = (infoHeader[20] & 0xFF) | ((infoHeader[21] & 0xFF) << 8) | ((infoHeader[22] & 0xFF) << 16) | ((infoHeader[23] & 0xFF) << 24);
         byte[] compressed = new byte[compressedSize];
         try {
             if (inputStream.read(compressed) != compressedSize)
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         decompressData(compressed, data, stride, cmp);
     }
@@ -385,10 +385,10 @@
         header[3] = inputStream.readShort();
         header[4] = inputStream.readInt();
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     if (header[0] != 0x4D42)
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     return header;
 }
 ImageData[] loadFromByteStream() {
@@ -397,7 +397,7 @@
     try {
         inputStream.read(infoHeader);
     } catch (TracedException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     int width = (infoHeader[4] & 0xFF) | ((infoHeader[5] & 0xFF) << 8) | ((infoHeader[6] & 0xFF) << 16) | ((infoHeader[7] & 0xFF) << 24);
     int height = (infoHeader[8] & 0xFF) | ((infoHeader[9] & 0xFF) << 8) | ((infoHeader[10] & 0xFF) << 16) | ((infoHeader[11] & 0xFF) << 24);
@@ -410,7 +410,7 @@
         try {
             inputStream.skip(fileHeader[4] - inputStream.getPosition());
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
     byte[] data = loadData(infoHeader);
@@ -418,7 +418,7 @@
     int xPelsPerMeter = (infoHeader[24] & 0xFF) | ((infoHeader[25] & 0xFF) << 8) | ((infoHeader[26] & 0xFF) << 16) | ((infoHeader[27] & 0xFF) << 24);
     int yPelsPerMeter = (infoHeader[28] & 0xFF) | ((infoHeader[29] & 0xFF) << 8) | ((infoHeader[30] & 0xFF) << 16) | ((infoHeader[31] & 0xFF) << 24);
     this.pelsPerMeter = new Point(xPelsPerMeter, yPelsPerMeter);
-    int type = (this.compression == 1 /*BMP_RLE8_COMPRESSION*/) || (this.compression == 2 /*BMP_RLE4_COMPRESSION*/) ? SWT.IMAGE_BMP_RLE : SWT.IMAGE_BMP;
+    int type = (this.compression == 1 /*BMP_RLE8_COMPRESSION*/) || (this.compression == 2 /*BMP_RLE4_COMPRESSION*/) ? DWT.IMAGE_BMP_RLE : DWT.IMAGE_BMP;
     return [
         ImageData.internal_new(
             width,
@@ -452,9 +452,9 @@
         byte[] buf = new byte[numColors * 4];
         try {
             if (inputStream.read(buf) != buf.length)
-                SWT.error(SWT.ERROR_INVALID_IMAGE);
+                DWT.error(DWT.ERROR_INVALID_IMAGE);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
         return paletteFromBytes(buf, numColors);
     }
@@ -463,7 +463,7 @@
             try {
                 return new PaletteData(inputStream.readInt(), inputStream.readInt(), inputStream.readInt());
             } catch (IOException e) {
-                SWT.error(SWT.ERROR_IO, e);
+                DWT.error(DWT.ERROR_IO, e);
             }
         }
         return new PaletteData(0x7C00, 0x3E0, 0x1F);
@@ -473,7 +473,7 @@
         try {
             return new PaletteData(inputStream.readInt(), inputStream.readInt(), inputStream.readInt());
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
     return new PaletteData(0xFF00, 0xFF0000, 0xFF000000);
@@ -540,7 +540,7 @@
         if (buf2Offset > 0)
             ostr.write(buf2, 0, buf2Offset);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return totalSize;
 }
@@ -588,7 +588,7 @@
             }
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return bmpBpl * image.height;
 }
@@ -602,20 +602,20 @@
     int numCols;
     if (!((image.depth == 1) || (image.depth == 4) || (image.depth == 8) ||
           (image.depth == 16) || (image.depth == 24) || (image.depth == 32)))
-            SWT.error(SWT.ERROR_UNSUPPORTED_DEPTH);
+            DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
     int comp = this.compression;
     if (!((comp == 0) || ((comp == 1) && (image.depth == 8)) ||
           ((comp == 2) && (image.depth == 4))))
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
     PaletteData pal = image.palette;
     if ((image.depth == 16) || (image.depth == 24) || (image.depth == 32)) {
         if (!pal.isDirect)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         numCols = 0;
         rgbs = null;
     } else {
         if (pal.isDirect)
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
         numCols = pal.colors.length;
         rgbs = paletteToBytes(pal);
     }
@@ -648,7 +648,7 @@
         outputStream.writeShort(fileHeader[3]);
         outputStream.writeInt(fileHeader[4]);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     try {
         outputStream.writeInt(BMPHeaderFixedSize);
@@ -663,7 +663,7 @@
         outputStream.writeInt(numCols);
         outputStream.writeInt(importantColors);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 
     // Unload palette
@@ -671,7 +671,7 @@
         try {
             outputStream.write(rgbs);
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
         }
     }
 
@@ -679,7 +679,7 @@
     try {
         outputStream.write(data);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 void flipScanLines(byte[] data, int stride, int height) {
--- a/dwt/internal/image/WinICOFileFormat.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/internal/image/WinICOFileFormat.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 public import dwt.internal.image.FileFormat;
 public import dwt.graphics.PaletteData;
 import dwt.internal.image.WinBMPFileFormat;
-import dwt.SWT;
+import dwt.DWT;
 
 import tango.core.Exception;
 
@@ -84,13 +84,13 @@
         fileHeader[1] = byteStream.readShort();
         fileHeader[2] = byteStream.readShort();
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     if ((fileHeader[0] != 0) || (fileHeader[1] != 1))
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     int numIcons = fileHeader[2];
     if (numIcons <= 0)
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     return numIcons;
 }
 int loadFileHeader(LEDataInputStream byteStream, bool hasHeader) {
@@ -105,13 +105,13 @@
         }
         fileHeader[2] = byteStream.readShort();
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     if ((fileHeader[0] != 0) || (fileHeader[1] != 1))
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     int numIcons = fileHeader[2];
     if (numIcons <= 0)
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     return numIcons;
 }
 ImageData[] loadFromByteStream() {
@@ -153,7 +153,7 @@
         null,
         -1,
         -1,
-        SWT.IMAGE_ICO,
+        DWT.IMAGE_ICO,
         0,
         0,
         0,
@@ -172,7 +172,7 @@
             headers[i][6] = inputStream.readInt();
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     return headers;
 }
@@ -183,13 +183,13 @@
     if (numColors == 0) numColors = 256; // this is specified: '00' represents '256' (0x100) colors
     if ((numColors != 2) && (numColors != 8) && (numColors != 16) &&
         (numColors != 32) && (numColors != 256))
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     if (inputStream.getPosition() < iconHeader[6]) {
         // Seek to the specified offset
         try {
             inputStream.skip(iconHeader[6] - inputStream.getPosition());
         } catch (IOException e) {
-            SWT.error(SWT.ERROR_IO, e);
+            DWT.error(DWT.ERROR_IO, e);
             return null;
         }
     }
@@ -197,17 +197,17 @@
     try {
         inputStream.read(infoHeader);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     if (((infoHeader[12] & 0xFF) | ((infoHeader[13] & 0xFF) << 8)) != 1)
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     int infoWidth = (infoHeader[4] & 0xFF) | ((infoHeader[5] & 0xFF) << 8) | ((infoHeader[6] & 0xFF) << 16) | ((infoHeader[7] & 0xFF) << 24);
     int infoHeight = (infoHeader[8] & 0xFF) | ((infoHeader[9] & 0xFF) << 8) | ((infoHeader[10] & 0xFF) << 16) | ((infoHeader[11] & 0xFF) << 24);
     int bitCount = (infoHeader[14] & 0xFF) | ((infoHeader[15] & 0xFF) << 8);
     if (height == infoHeight && bitCount == 1) height /= 2;
     if (!((width == infoWidth) && (height * 2 == infoHeight) &&
         (bitCount == 1 || bitCount == 4 || bitCount == 8 || bitCount == 24 || bitCount == 32)))
-            SWT.error(SWT.ERROR_INVALID_IMAGE);
+            DWT.error(DWT.ERROR_INVALID_IMAGE);
     infoHeader[8] = cast(byte)(height & 0xFF);
     infoHeader[9] = cast(byte)((height >> 8) & 0xFF);
     infoHeader[10] = cast(byte)((height >> 16) & 0xFF);
@@ -233,14 +233,14 @@
         outputStream.writeInt(icon.palette.colors != null ? icon.palette.colors.length : 0);
         outputStream.writeInt(0);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 
     byte[] rgbs = WinBMPFileFormat.paletteToBytes(icon.palette);
     try {
         outputStream.write(rgbs);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     unloadShapeData(icon);
     unloadMaskData(icon);
@@ -261,7 +261,7 @@
         outputStream.writeInt(iconSize);
         outputStream.writeInt(offset);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 void unloadIntoByteStream(ImageLoader loader) {
@@ -269,13 +269,13 @@
      * so we use the first image data in the loader's array. */
     ImageData image = loader.data[0];
     if (!isValidIcon(image))
-        SWT.error(SWT.ERROR_INVALID_IMAGE);
+        DWT.error(DWT.ERROR_INVALID_IMAGE);
     try {
         outputStream.writeShort(0);
         outputStream.writeShort(1);
         outputStream.writeShort(1);
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
     unloadIconHeader(image);
     unloadIcon(image);
@@ -301,7 +301,7 @@
             offset -= srcBpl;
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 /**
@@ -322,7 +322,7 @@
             offset -= srcBpl;
         }
     } catch (IOException e) {
-        SWT.error(SWT.ERROR_IO, e);
+        DWT.error(DWT.ERROR_IO, e);
     }
 }
 }
--- a/dwt/layout/FillData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/FillData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.FillData;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 
@@ -21,7 +21,7 @@
 
 Point computeSize (Control control, int wHint, int hHint, bool flushCache_) {
     if (flushCache_) flushCache();
-    if (wHint is SWT.DEFAULT && hHint is SWT.DEFAULT) {
+    if (wHint is DWT.DEFAULT && hHint is DWT.DEFAULT) {
         if (defaultWidth is -1 || defaultHeight is -1) {
             Point size = control.computeSize (wHint, hHint, flushCache_);
             defaultWidth = size.x;
--- a/dwt/layout/FillLayout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/FillLayout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.FillLayout;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.widgets.Control;
@@ -43,7 +43,7 @@
  * children are always the same size, and they fill all available space.
  * <pre>
  *      FillLayout fillLayout = new FillLayout();
- *      fillLayout.type = SWT.VERTICAL;
+ *      fillLayout.type = DWT.VERTICAL;
  *      shell.setLayout(fillLayout);
  * </pre>
  * </p>
@@ -60,7 +60,7 @@
      *    <li>VERTICAL: Position the controls vertically from top to bottom</li>
      * </ul>
      */
-    public int type = SWT.HORIZONTAL;
+    public int type = DWT.HORIZONTAL;
 
     /**
      * marginWidth specifies the number of pixels of horizontal margin
@@ -117,10 +117,10 @@
         Control child = children [i];
         int w = wHint, h = hHint;
         if (count > 0) {
-            if (type is SWT.HORIZONTAL && wHint !is SWT.DEFAULT) {
+            if (type is DWT.HORIZONTAL && wHint !is DWT.DEFAULT) {
                 w = Math.max (0, (wHint - (count - 1) * spacing) / count);
             }
-            if (type is SWT.VERTICAL && hHint !is SWT.DEFAULT) {
+            if (type is DWT.VERTICAL && hHint !is DWT.DEFAULT) {
                 h = Math.max (0, (hHint - (count - 1) * spacing) / count);
             }
         }
@@ -129,7 +129,7 @@
         maxHeight = Math.max (maxHeight, size.y);
     }
     int width = 0, height = 0;
-    if (type is SWT.HORIZONTAL) {
+    if (type is DWT.HORIZONTAL) {
         width = count * maxWidth;
         if (count !is 0) width += (count - 1) * spacing;
         height = maxHeight;
@@ -140,8 +140,8 @@
     }
     width += marginWidth * 2;
     height += marginHeight * 2;
-    if (wHint !is SWT.DEFAULT) width = wHint;
-    if (hHint !is SWT.DEFAULT) height = hHint;
+    if (wHint !is DWT.DEFAULT) width = wHint;
+    if (hHint !is DWT.DEFAULT) height = hHint;
     return new Point (width, height);
 }
 
@@ -152,7 +152,7 @@
         control.setLayoutData (data);
     }
     Point size = null;
-    if (wHint is SWT.DEFAULT && hHint is SWT.DEFAULT) {
+    if (wHint is DWT.DEFAULT && hHint is DWT.DEFAULT) {
         size = data.computeSize (control, wHint, hHint, flushCache);
     } else {
         // TEMPORARY CODE
@@ -164,8 +164,8 @@
         } else {
             trimX = trimY = control.getBorderWidth () * 2;
         }
-        int w = wHint is SWT.DEFAULT ? wHint : Math.max (0, wHint - trimX);
-        int h = hHint is SWT.DEFAULT ? hHint : Math.max (0, hHint - trimY);
+        int w = wHint is DWT.DEFAULT ? wHint : Math.max (0, wHint - trimX);
+        int h = hHint is DWT.DEFAULT ? hHint : Math.max (0, hHint - trimY);
         size = data.computeSize (control, w, h, flushCache);
     }
     return size;
@@ -191,7 +191,7 @@
     if (count is 0) return;
     int width = rect.width - marginWidth * 2;
     int height = rect.height - marginHeight * 2;
-    if (type is SWT.HORIZONTAL) {
+    if (type is DWT.HORIZONTAL) {
         width -= (count - 1) * spacing;
         int x = rect.x + marginWidth, extra = width % count;
         int y = rect.y + marginHeight, cellWidth = width / count;
@@ -232,7 +232,7 @@
  */
 public char[] toString () {
     char[] string = getName () ~ " {";
-    string ~= "type="~((type is SWT.VERTICAL) ? "SWT.VERTICAL" : "SWT.HORIZONTAL")~" ";
+    string ~= "type="~((type is DWT.VERTICAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" ";
     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" ";
     if (marginHeight !is 0) string ~= "marginHeight="~to!(char[])(marginHeight)~" ";
     if (spacing !is 0) string ~= "spacing="~to!(char[])(spacing)~" ";
--- a/dwt/layout/FormAttachment.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/FormAttachment.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.FormAttachment;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.widgets.Control;
 import dwt.layout.FormLayout;
 import dwt.layout.FormData;
@@ -60,14 +60,14 @@
  * For example:
  * <pre>
  *      FormData data = new FormData ();
- *      data.left = new FormAttachment (button, 0, SWT.LEFT);
+ *      data.left = new FormAttachment (button, 0, DWT.LEFT);
  * </pre>
  * specifies that the left side of the control will lie in the same position
  * as the left side of the <code>button</code> control. The control can also
  * be attached in a position that will center the control on the specified
  * control. For example:
  * <pre>
- *      data.left = new FormAttachment (button, 0, SWT.CENTER);
+ *      data.left = new FormAttachment (button, 0, DWT.CENTER);
  * </pre>
  * specifies that the left side of the control will be positioned so that it is
  * centered between the left and right sides of the <code>button</code> control.
@@ -183,7 +183,7 @@
  * @param offset the offset of the side from the position
  */
 public this (int numerator, int denominator, int offset) {
-    if (denominator == 0) SWT.error (SWT.ERROR_CANNOT_BE_ZERO);
+    if (denominator == 0) DWT.error (DWT.ERROR_CANNOT_BE_ZERO);
     this.numerator = numerator;
     this.denominator = denominator;
     this.offset = offset;
@@ -199,7 +199,7 @@
  * @param control the control the side is attached to
  */
 public this (Control control) {
-    this (control, 0, SWT.DEFAULT);
+    this (control, 0, DWT.DEFAULT);
 }
 
 /**
@@ -212,7 +212,7 @@
  * @param offset the offset of the side from the control
  */
 public this (Control control, int offset) {
-    this (control, offset, SWT.DEFAULT);
+    this (control, offset, DWT.DEFAULT);
 }
 
 /**
@@ -281,12 +281,12 @@
 }
 
 int solveX (int value) {
-    if (denominator == 0) SWT.error (SWT.ERROR_CANNOT_BE_ZERO);
+    if (denominator == 0) DWT.error (DWT.ERROR_CANNOT_BE_ZERO);
     return ((numerator * value) / denominator) + offset;
 }
 
 int solveY (int value) {
-    if (numerator == 0) SWT.error (SWT.ERROR_CANNOT_BE_ZERO);
+    if (numerator == 0) DWT.error (DWT.ERROR_CANNOT_BE_ZERO);
     return (value - offset) * denominator / numerator;
 }
 
--- a/dwt/layout/FormData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/FormData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.layout.FormData;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 import dwt.layout.FormAttachment;
@@ -53,21 +53,21 @@
      * is the wHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see Control#computeSize(int, int, bool)
      */
-    public int width = SWT.DEFAULT;
+    public int width = DWT.DEFAULT;
     /**
      * height specifies the preferred height in pixels. This value
      * is the hHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see Control#computeSize(int, int, bool)
      */
-    public int height = SWT.DEFAULT;
+    public int height = DWT.DEFAULT;
     /**
      * left specifies the attachment of the left side of
      * the control.
@@ -103,7 +103,7 @@
 
 /**
  * Constructs a new instance of FormData according to the parameters.
- * A value of SWT.DEFAULT indicates that no minimum width or
+ * A value of DWT.DEFAULT indicates that no minimum width or
  * no minimum height is specified.
  *
  * @param width a minimum width for the control
@@ -178,10 +178,10 @@
     FormData bottomData = cast(FormData) bottomControl.getLayoutData ();
     FormAttachment bottomAttachment = bottomData.getBottomAttachment (bottomControl, spacing, flushCache);
     switch (bottom.alignment) {
-        case SWT.BOTTOM:
+        case DWT.BOTTOM:
             cacheBottom = bottomAttachment.plus (bottom.offset);
             break;
-        case SWT.CENTER: {
+        case DWT.CENTER: {
             FormAttachment topAttachment = bottomData.getTopAttachment (bottomControl, spacing, flushCache);
             FormAttachment bottomHeight = bottomAttachment.minus (topAttachment);
             cacheBottom = bottomAttachment.minus (bottomHeight.minus (getHeight (control, flushCache)).divide (2));
@@ -219,10 +219,10 @@
     FormData leftData = cast(FormData) leftControl.getLayoutData ();
     FormAttachment leftAttachment = leftData.getLeftAttachment (leftControl, spacing, flushCache);
     switch (left.alignment) {
-        case SWT.LEFT:
+        case DWT.LEFT:
             cacheLeft = leftAttachment.plus (left.offset);
             break;
-        case SWT.CENTER: {
+        case DWT.CENTER: {
             FormAttachment rightAttachment = leftData.getRightAttachment (leftControl, spacing, flushCache);
             FormAttachment leftWidth = rightAttachment.minus (leftAttachment);
             cacheLeft = leftAttachment.plus (leftWidth.minus (getWidth (control, flushCache)).divide (2));
@@ -266,10 +266,10 @@
     FormData rightData = cast(FormData) rightControl.getLayoutData ();
     FormAttachment rightAttachment = rightData.getRightAttachment (rightControl, spacing, flushCache);
     switch (right.alignment) {
-        case SWT.RIGHT:
+        case DWT.RIGHT:
             cacheRight = rightAttachment.plus (right.offset);
             break;
-        case SWT.CENTER: {
+        case DWT.CENTER: {
             FormAttachment leftAttachment = rightData.getLeftAttachment (rightControl, spacing, flushCache);
             FormAttachment rightWidth = rightAttachment.minus (leftAttachment);
             cacheRight = rightAttachment.minus (rightWidth.minus (getWidth (control, flushCache)).divide (2));
@@ -307,10 +307,10 @@
     FormData topData = cast(FormData) topControl.getLayoutData ();
     FormAttachment topAttachment = topData.getTopAttachment (topControl, spacing, flushCache);
     switch (top.alignment) {
-        case SWT.TOP:
+        case DWT.TOP:
             cacheTop = topAttachment.plus (top.offset);
             break;
-        case SWT.CENTER: {
+        case DWT.CENTER: {
             FormAttachment bottomAttachment = topData.getBottomAttachment (topControl, spacing, flushCache);
             FormAttachment topHeight = bottomAttachment.minus (topAttachment);
             cacheTop = topAttachment.plus (topHeight.minus (getHeight (control, flushCache)).divide (2));
@@ -334,8 +334,8 @@
  */
 public char[] toString () {
     char[] string = getName()~" {";
-    if (width !is SWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
-    if (height !is SWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
+    if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
+    if (height !is DWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
     if (left !is null) string ~= "left="~to!(char[])(left)~" ";
     if (right !is null) string ~= "right="~to!(char[])(right)~" ";
     if (top !is null) string ~= "top="~to!(char[])(top)~" ";
--- a/dwt/layout/FormLayout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/FormLayout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 import dwt.layout.FormAttachment;
 import dwt.layout.FormData;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.widgets.Control;
@@ -247,8 +247,8 @@
 
 protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache) {
     Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache);
-    if (wHint !is SWT.DEFAULT) size.x = wHint;
-    if (hHint !is SWT.DEFAULT) size.y = hHint;
+    if (wHint !is DWT.DEFAULT) size.x = wHint;
+    if (hHint !is DWT.DEFAULT) size.y = hHint;
     return size;
 }
 
@@ -309,12 +309,12 @@
     for (int i=0; i<children.length; i++) {
         Control child = children [i];
         FormData data = cast(FormData) child.getLayoutData ();
-        if (width !is SWT.DEFAULT) {
+        if (width !is DWT.DEFAULT) {
             data.needed = false;
             FormAttachment left = data.getLeftAttachment (child, spacing, flushCache);
             FormAttachment right = data.getRightAttachment (child, spacing, flushCache);
             int x1 = left.solveX (width), x2 = right.solveX (width);
-            if (data.height is SWT.DEFAULT && !data.needed) {
+            if (data.height is DWT.DEFAULT && !data.needed) {
                 int trim = 0;
                 //TEMPORARY CODE
                 if ( auto sa = cast(Scrollable)child) {
@@ -343,7 +343,7 @@
     for (int i=0; i<children.length; i++) {
         Control child = children [i];
         FormData data = cast(FormData) child.getLayoutData ();
-        if (height !is SWT.DEFAULT) {
+        if (height !is DWT.DEFAULT) {
             int y1 = data.getTopAttachment (child, spacing, flushCache).solveX (height);
             int y2 = data.getBottomAttachment (child, spacing, flushCache).solveX (height);
             h = Math.max (y2, h);
--- a/dwt/layout/GridData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/GridData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.GridData;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 
@@ -55,10 +55,10 @@
      * The default value is CENTER.
      *
      * Possible values are: <ul>
-     *    <li>SWT.BEGINNING (or SWT.TOP): Position the control at the top of the cell</li>
-     *    <li>SWT.CENTER: Position the control in the vertical center of the cell</li>
-     *    <li>SWT.END (or SWT.BOTTOM): Position the control at the bottom of the cell</li>
-     *    <li>SWT.FILL: Resize the control to fill the cell vertically</li>
+     *    <li>DWT.BEGINNING (or DWT.TOP): Position the control at the top of the cell</li>
+     *    <li>DWT.CENTER: Position the control in the vertical center of the cell</li>
+     *    <li>DWT.END (or DWT.BOTTOM): Position the control at the bottom of the cell</li>
+     *    <li>DWT.FILL: Resize the control to fill the cell vertically</li>
      * </ul>
      */
     public int verticalAlignment = CENTER;
@@ -70,10 +70,10 @@
      * The default value is BEGINNING.
      *
      * Possible values are: <ul>
-     *    <li>SWT.BEGINNING (or SWT.LEFT): Position the control at the left of the cell</li>
-     *    <li>SWT.CENTER: Position the control in the horizontal center of the cell</li>
-     *    <li>SWT.END (or SWT.RIGHT): Position the control at the right of the cell</li>
-     *    <li>SWT.FILL: Resize the control to fill the cell horizontally</li>
+     *    <li>DWT.BEGINNING (or DWT.LEFT): Position the control at the left of the cell</li>
+     *    <li>DWT.CENTER: Position the control in the horizontal center of the cell</li>
+     *    <li>DWT.END (or DWT.RIGHT): Position the control at the right of the cell</li>
+     *    <li>DWT.FILL: Resize the control to fill the cell horizontally</li>
      * </ul>
      */
     public int horizontalAlignment = BEGINNING;
@@ -83,22 +83,22 @@
      * is the wHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see Control#computeSize(int, int, bool)
      */
-    public int widthHint = SWT.DEFAULT;
+    public int widthHint = DWT.DEFAULT;
 
     /**
      * heightHint specifies the preferred height in pixels. This value
      * is the hHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see Control#computeSize(int, int, bool)
      */
-    public int heightHint = SWT.DEFAULT;
+    public int heightHint = DWT.DEFAULT;
 
     /**
      * horizontalIndent specifies the number of pixels of indentation
@@ -199,7 +199,7 @@
     /**
      * minimumWidth specifies the minimum width in pixels.  This value
      * applies only if grabExcessHorizontalSpace is true. A value of
-     * SWT.DEFAULT means that the minimum width will be the result
+     * DWT.DEFAULT means that the minimum width will be the result
      * of Control.computeSize(int, int, bool) where wHint is
      * determined by GridData.widthHint.
      *
@@ -214,7 +214,7 @@
     /**
      * minimumHeight specifies the minimum height in pixels.  This value
      * applies only if grabExcessVerticalSpace is true.  A value of
-     * SWT.DEFAULT means that the minimum height will be the result
+     * DWT.DEFAULT means that the minimum height will be the result
      * of Control.computeSize(int, int, bool) where hHint is
      * determined by GridData.heightHint.
      *
@@ -242,36 +242,36 @@
     /**
      * Value for horizontalAlignment or verticalAlignment.
      * Position the control at the top or left of the cell.
-     * Not recommended. Use SWT.BEGINNING, SWT.TOP or SWT.LEFT instead.
+     * Not recommended. Use DWT.BEGINNING, DWT.TOP or DWT.LEFT instead.
      */
-    public static const int BEGINNING = SWT.BEGINNING;
+    public static const int BEGINNING = DWT.BEGINNING;
 
     /**
      * Value for horizontalAlignment or verticalAlignment.
      * Position the control in the vertical or horizontal center of the cell
-     * Not recommended. Use SWT.CENTER instead.
+     * Not recommended. Use DWT.CENTER instead.
      */
     public static const int CENTER = 2;
 
     /**
      * Value for horizontalAlignment or verticalAlignment.
      * Position the control at the bottom or right of the cell
-     * Not recommended. Use SWT.END, SWT.BOTTOM or SWT.RIGHT instead.
+     * Not recommended. Use DWT.END, DWT.BOTTOM or DWT.RIGHT instead.
      */
     public static const int END = 3;
 
     /**
      * Value for horizontalAlignment or verticalAlignment.
      * Resize the control to fill the cell horizontally or vertically.
-     * Not recommended. Use SWT.FILL instead.
+     * Not recommended. Use DWT.FILL instead.
      */
-    public static const int FILL = SWT.FILL;
+    public static const int FILL = DWT.FILL;
 
     /**
      * Style bit for <code>new GridData(int)</code>.
      * Position the control at the top of the cell.
      * Not recommended. Use
-     * <code>new GridData(int, SWT.BEGINNING, bool, bool)</code>
+     * <code>new GridData(int, DWT.BEGINNING, bool, bool)</code>
      * instead.
      */
     public static const int VERTICAL_ALIGN_BEGINNING =  1 << 1;
@@ -280,7 +280,7 @@
      * Style bit for <code>new GridData(int)</code> to position the
      * control in the vertical center of the cell.
      * Not recommended. Use
-     * <code>new GridData(int, SWT.CENTER, bool, bool)</code>
+     * <code>new GridData(int, DWT.CENTER, bool, bool)</code>
      * instead.
      */
     public static const int VERTICAL_ALIGN_CENTER = 1 << 2;
@@ -289,7 +289,7 @@
      * Style bit for <code>new GridData(int)</code> to position the
      * control at the bottom of the cell.
      * Not recommended. Use
-     * <code>new GridData(int, SWT.END, bool, bool)</code>
+     * <code>new GridData(int, DWT.END, bool, bool)</code>
      * instead.
      */
     public static const int VERTICAL_ALIGN_END = 1 << 3;
@@ -298,7 +298,7 @@
      * Style bit for <code>new GridData(int)</code> to resize the
      * control to fill the cell vertically.
      * Not recommended. Use
-     * <code>new GridData(int, SWT.FILL, bool, bool)</code>
+     * <code>new GridData(int, DWT.FILL, bool, bool)</code>
      * instead
      */
     public static const int VERTICAL_ALIGN_FILL = 1 << 4;
@@ -307,7 +307,7 @@
      * Style bit for <code>new GridData(int)</code> to position the
      * control at the left of the cell.
      * Not recommended. Use
-     * <code>new GridData(SWT.BEGINNING, int, bool, bool)</code>
+     * <code>new GridData(DWT.BEGINNING, int, bool, bool)</code>
      * instead.
      */
     public static const int HORIZONTAL_ALIGN_BEGINNING =  1 << 5;
@@ -316,7 +316,7 @@
      * Style bit for <code>new GridData(int)</code> to position the
      * control in the horizontal center of the cell.
      * Not recommended. Use
-     * <code>new GridData(SWT.CENTER, int, bool, bool)</code>
+     * <code>new GridData(DWT.CENTER, int, bool, bool)</code>
      * instead.
      */
     public static const int HORIZONTAL_ALIGN_CENTER = 1 << 6;
@@ -325,7 +325,7 @@
      * Style bit for <code>new GridData(int)</code> to position the
      * control at the right of the cell.
      * Not recommended. Use
-     * <code>new GridData(SWT.END, int, bool, bool)</code>
+     * <code>new GridData(DWT.END, int, bool, bool)</code>
      * instead.
      */
     public static const int HORIZONTAL_ALIGN_END = 1 << 7;
@@ -334,7 +334,7 @@
      * Style bit for <code>new GridData(int)</code> to resize the
      * control to fill the cell horizontally.
      * Not recommended. Use
-     * <code>new GridData(SWT.FILL, int, bool, bool)</code>
+     * <code>new GridData(DWT.FILL, int, bool, bool)</code>
      * instead.
      */
     public static const int HORIZONTAL_ALIGN_FILL = 1 << 8;
@@ -363,7 +363,7 @@
      * vertical space.
      * FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL
      * Not recommended. Use
-     * <code>new GridData(int, SWT.FILL, bool, true)</code>
+     * <code>new GridData(int, DWT.FILL, bool, true)</code>
      * instead.
      */
     public static const int FILL_VERTICAL = VERTICAL_ALIGN_FILL | GRAB_VERTICAL;
@@ -374,7 +374,7 @@
      * horizontal space.
      * FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL
      * Not recommended. Use
-     * <code>new GridData(SWT.FILL, int, true, bool)</code>
+     * <code>new GridData(DWT.FILL, int, true, bool)</code>
      * instead.
      */
     public static const int FILL_HORIZONTAL = HORIZONTAL_ALIGN_FILL | GRAB_HORIZONTAL;
@@ -385,7 +385,7 @@
      * to fit the remaining horizontal and vertical space.
      * FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL
      * Not recommended. Use
-     * <code>new GridData(SWT.FILL, SWT.FILL, true, true)</code>
+     * <code>new GridData(DWT.FILL, DWT.FILL, true, true)</code>
      * instead.
      */
     public static const int FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL;
@@ -457,7 +457,7 @@
 
 /**
  * Constructs a new instance of GridData according to the parameters.
- * A value of SWT.DEFAULT indicates that no minimum width or
+ * A value of DWT.DEFAULT indicates that no minimum width or
  * no minimum height is specified.
  *
  * @param width a minimum width for the column
@@ -517,25 +517,25 @@
 public char[] toString () {
     char[] hAlign = "";
     switch (horizontalAlignment) {
-        case SWT.FILL: hAlign = "SWT.FILL"; break;
-        case SWT.BEGINNING: hAlign = "SWT.BEGINNING"; break;
-        case SWT.LEFT: hAlign = "SWT.LEFT"; break;
-        case SWT.END: hAlign = "SWT.END"; break;
+        case DWT.FILL: hAlign = "DWT.FILL"; break;
+        case DWT.BEGINNING: hAlign = "DWT.BEGINNING"; break;
+        case DWT.LEFT: hAlign = "DWT.LEFT"; break;
+        case DWT.END: hAlign = "DWT.END"; break;
         case END: hAlign = "GridData.END"; break;
-        case SWT.RIGHT: hAlign = "SWT.RIGHT"; break;
-        case SWT.CENTER: hAlign = "SWT.CENTER"; break;
+        case DWT.RIGHT: hAlign = "DWT.RIGHT"; break;
+        case DWT.CENTER: hAlign = "DWT.CENTER"; break;
         case CENTER: hAlign = "GridData.CENTER"; break;
         default: hAlign = "Undefined "~to!(char[])(horizontalAlignment); break;
     }
     char[] vAlign = "";
     switch (verticalAlignment) {
-        case SWT.FILL: vAlign = "SWT.FILL"; break;
-        case SWT.BEGINNING: vAlign = "SWT.BEGINNING"; break;
-        case SWT.TOP: vAlign = "SWT.TOP"; break;
-        case SWT.END: vAlign = "SWT.END"; break;
+        case DWT.FILL: vAlign = "DWT.FILL"; break;
+        case DWT.BEGINNING: vAlign = "DWT.BEGINNING"; break;
+        case DWT.TOP: vAlign = "DWT.TOP"; break;
+        case DWT.END: vAlign = "DWT.END"; break;
         case END: vAlign = "GridData.END"; break;
-        case SWT.BOTTOM: vAlign = "SWT.BOTTOM"; break;
-        case SWT.CENTER: vAlign = "SWT.CENTER"; break;
+        case DWT.BOTTOM: vAlign = "DWT.BOTTOM"; break;
+        case DWT.CENTER: vAlign = "DWT.CENTER"; break;
         case CENTER: vAlign = "GridData.CENTER"; break;
         default: vAlign = "Undefined "~to!(char[])(verticalAlignment); break;
     }
@@ -544,13 +544,13 @@
     if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(char[])(horizontalIndent)~" ";
     if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(char[])(horizontalSpan)~" ";
     if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(char[])(grabExcessHorizontalSpace)~" ";
-    if (widthHint !is SWT.DEFAULT) string ~= "widthHint="~to!(char[])(widthHint)~" ";
+    if (widthHint !is DWT.DEFAULT) string ~= "widthHint="~to!(char[])(widthHint)~" ";
     if (minimumWidth !is 0) string ~= "minimumWidth="~to!(char[])(minimumWidth)~" ";
     string ~= "verticalAlignment="~vAlign~" ";
     if (verticalIndent !is 0) string ~= "verticalIndent="~to!(char[])(verticalIndent)~" ";
     if (verticalSpan !is 1) string ~= "verticalSpan="~to!(char[])(verticalSpan)~" ";
     if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(char[])(grabExcessVerticalSpace)~" ";
-    if (heightHint !is SWT.DEFAULT) string ~= "heightHint="~to!(char[])(heightHint)~" ";
+    if (heightHint !is DWT.DEFAULT) string ~= "heightHint="~to!(char[])(heightHint)~" ";
     if (minimumHeight !is 0) string ~= "minimumHeight="~to!(char[])(minimumHeight)~" ";
     if (exclude) string ~= "exclude="~to!(char[])(exclude)~" ";
     string = string.trim();
--- a/dwt/layout/GridLayout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/GridLayout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.layout.GridLayout;
 
 import dwt.layout.GridData;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.widgets.Control;
@@ -170,8 +170,8 @@
 
 protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
     Point size = layout (composite, false, 0, 0, wHint, hHint, flushCache_);
-    if (wHint !is SWT.DEFAULT) size.x = wHint;
-    if (hHint !is SWT.DEFAULT) size.y = hHint;
+    if (wHint !is DWT.DEFAULT) size.x = wHint;
+    if (hHint !is DWT.DEFAULT) size.y = hHint;
     return size;
 }
 
@@ -235,7 +235,7 @@
                 } else {
                     trim = child.getBorderWidth () * 2;
                 }
-                data.cacheWidth = data.cacheHeight = SWT.DEFAULT;
+                data.cacheWidth = data.cacheHeight = DWT.DEFAULT;
                 data.computeSize (child, Math.max (0, data.minimumWidth - trim), data.heightHint, false);
             }
         }
@@ -310,7 +310,7 @@
                         expandColumn [j] = true;
                     }
                     if (!data.grabExcessHorizontalSpace || data.minimumWidth !is 0) {
-                        w = !data.grabExcessHorizontalSpace || data.minimumWidth is SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+                        w = !data.grabExcessHorizontalSpace || data.minimumWidth is DWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
                         w += data.horizontalIndent;
                         minWidths [j] = Math.max (minWidths [j], w);
                     }
@@ -357,7 +357,7 @@
                         }
                     }
                     if (!data.grabExcessHorizontalSpace || data.minimumWidth !is 0) {
-                        w = !data.grabExcessHorizontalSpace || data.minimumWidth is SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+                        w = !data.grabExcessHorizontalSpace || data.minimumWidth is DWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
                         w += data.horizontalIndent - spanMinWidth - (hSpan - 1) * horizontalSpacing;
                         if (w > 0) {
                             if (spanExpandCount is 0) {
@@ -385,13 +385,13 @@
             minColumnWidth = Math.max (minColumnWidth, minWidths [i]);
             columnWidth = Math.max (columnWidth, widths [i]);
         }
-        columnWidth = width is SWT.DEFAULT || expandCount is 0 ? columnWidth : Math.max (minColumnWidth, availableWidth / columnCount);
+        columnWidth = width is DWT.DEFAULT || expandCount is 0 ? columnWidth : Math.max (minColumnWidth, availableWidth / columnCount);
         for (int i=0; i<columnCount; i++) {
             expandColumn [i] = expandCount > 0;
             widths [i] = columnWidth;
         }
     } else {
-        if (width !is SWT.DEFAULT && expandCount > 0) {
+        if (width !is DWT.DEFAULT && expandCount > 0) {
             int totalWidth = 0;
             for (int i=0; i<columnCount; i++) {
                 totalWidth += widths [i];
@@ -426,7 +426,7 @@
                                         spanWidth += widths [j-k];
                                         if (expandColumn [j-k]) spanExpandCount++;
                                     }
-                                    int w = !data.grabExcessHorizontalSpace || data.minimumWidth is SWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
+                                    int w = !data.grabExcessHorizontalSpace || data.minimumWidth is DWT.DEFAULT ? data.cacheWidth : data.minimumWidth;
                                     w += data.horizontalIndent - spanWidth - (hSpan - 1) * horizontalSpacing;
                                     if (w > 0) {
                                         if (spanExpandCount is 0) {
@@ -462,12 +462,12 @@
     /* Wrapping */
     GridData [] flush = null;
     int flushLength = 0;
-    if (width !is SWT.DEFAULT) {
+    if (width !is DWT.DEFAULT) {
         for (int j=0; j<columnCount; j++) {
             for (int i=0; i<rowCount; i++) {
                 GridData data = getData (grid, i, j, rowCount, columnCount, false);
                 if (data !is null) {
-                    if (data.heightHint is SWT.DEFAULT) {
+                    if (data.heightHint is DWT.DEFAULT) {
                         Control child = grid [i][j];
                         //TEMPORARY CODE
                         int hSpan = Math.max (1, Math.min (data.horizontalSpan, columnCount));
@@ -476,7 +476,7 @@
                             currentWidth += widths [j-k];
                         }
                         currentWidth += (hSpan - 1) * horizontalSpacing - data.horizontalIndent;
-                        if ((currentWidth !is data.cacheWidth && data.horizontalAlignment is SWT.FILL) || (data.cacheWidth > currentWidth)) {
+                        if ((currentWidth !is data.cacheWidth && data.horizontalAlignment is DWT.FILL) || (data.cacheWidth > currentWidth)) {
                             int trim = 0;
                             if ( auto sa = cast(Scrollable)child ) {
                                 Rectangle rect = sa.computeTrim (0, 0, 0, 0);
@@ -484,7 +484,7 @@
                             } else {
                                 trim = child.getBorderWidth () * 2;
                             }
-                            data.cacheWidth = data.cacheHeight = SWT.DEFAULT;
+                            data.cacheWidth = data.cacheHeight = DWT.DEFAULT;
                             data.computeSize (child, Math.max (0, currentWidth - trim), data.heightHint, false);
                             if (data.grabExcessVerticalSpace && data.minimumHeight > 0) {
                                 data.cacheHeight = Math.max (data.cacheHeight, data.minimumHeight);
@@ -517,7 +517,7 @@
                         expandRow [i] = true;
                     }
                     if (!data.grabExcessVerticalSpace || data.minimumHeight !is 0) {
-                        h = !data.grabExcessVerticalSpace || data.minimumHeight is SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+                        h = !data.grabExcessVerticalSpace || data.minimumHeight is DWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
                         h += data.verticalIndent;
                         minHeights [i] = Math.max (minHeights [i], h);
                     }
@@ -555,7 +555,7 @@
                         }
                     }
                     if (!data.grabExcessVerticalSpace || data.minimumHeight !is 0) {
-                        h = !data.grabExcessVerticalSpace || data.minimumHeight is SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+                        h = !data.grabExcessVerticalSpace || data.minimumHeight is DWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
                         h += data.verticalIndent - spanMinHeight - (vSpan - 1) * verticalSpacing;
                         if (h > 0) {
                             if (spanExpandCount is 0) {
@@ -576,7 +576,7 @@
             }
         }
     }
-    if (height !is SWT.DEFAULT && expandCount > 0) {
+    if (height !is DWT.DEFAULT && expandCount > 0) {
         int totalHeight = 0;
         for (int i=0; i<rowCount; i++) {
             totalHeight += heights [i];
@@ -611,7 +611,7 @@
                                     spanHeight += heights [i-k];
                                     if (expandRow [i-k]) spanExpandCount++;
                                 }
-                                int h = !data.grabExcessVerticalSpace || data.minimumHeight is SWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
+                                int h = !data.grabExcessVerticalSpace || data.minimumHeight is DWT.DEFAULT ? data.cacheHeight : data.minimumHeight;
                                 h += data.verticalIndent - spanHeight - (vSpan - 1) * verticalSpacing;
                                 if (h > 0) {
                                     if (spanExpandCount is 0) {
@@ -664,16 +664,16 @@
                     int childX = gridX + data.horizontalIndent;
                     int childWidth = Math.min (data.cacheWidth, cellWidth);
                     switch (data.horizontalAlignment) {
-                        case SWT.CENTER:
+                        case DWT.CENTER:
                         case GridData.CENTER:
                             childX += Math.max (0, (cellWidth - data.horizontalIndent - childWidth) / 2);
                             break;
-                        case SWT.RIGHT:
-                        case SWT.END:
+                        case DWT.RIGHT:
+                        case DWT.END:
                         case GridData.END:
                             childX += Math.max (0, cellWidth - data.horizontalIndent - childWidth);
                             break;
-                        case SWT.FILL:
+                        case DWT.FILL:
                             childWidth = cellWidth - data.horizontalIndent;
                             break;
                         default:
@@ -682,16 +682,16 @@
                     int childY = gridY + data.verticalIndent;
                     int childHeight = Math.min (data.cacheHeight, cellHeight);
                     switch (data.verticalAlignment) {
-                        case SWT.CENTER:
+                        case DWT.CENTER:
                         case GridData.CENTER:
                             childY += Math.max (0, (cellHeight - data.verticalIndent - childHeight) / 2);
                             break;
-                        case SWT.BOTTOM:
-                        case SWT.END:
+                        case DWT.BOTTOM:
+                        case DWT.END:
                         case GridData.END:
                             childY += Math.max (0, cellHeight - data.verticalIndent - childHeight);
                             break;
-                        case SWT.FILL:
+                        case DWT.FILL:
                             childHeight = cellHeight - data.verticalIndent;
                             break;
                         default:
--- a/dwt/layout/RowData.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/RowData.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.RowData;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 
@@ -28,7 +28,7 @@
  *      Display display = new Display();
  *      Shell shell = new Shell(display);
  *      shell.setLayout(new RowLayout());
- *      Button button1 = new Button(shell, SWT.PUSH);
+ *      Button button1 = new Button(shell, DWT.PUSH);
  *      button1.setText("Button 1");
  *      button1.setLayoutData(new RowData(50, 40));
  * </pre>
@@ -42,21 +42,21 @@
      * is the wHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see dwt.widgets.Control#computeSize(int, int, bool)
      */
-    public int width = SWT.DEFAULT;
+    public int width = DWT.DEFAULT;
     /**
      * height specifies the preferred height in pixels. This value
      * is the hHint passed into Control.computeSize(int, int, bool)
      * to determine the preferred size of the control.
      *
-     * The default value is SWT.DEFAULT.
+     * The default value is DWT.DEFAULT.
      *
      * @see dwt.widgets.Control#computeSize(int, int, bool)
      */
-    public int height = SWT.DEFAULT;
+    public int height = DWT.DEFAULT;
 
     /**
      * exclude informs the layout to ignore this control when sizing
@@ -80,7 +80,7 @@
 
 /**
  * Constructs a new instance of RowData according to the parameters.
- * A value of SWT.DEFAULT indicates that no minimum width or
+ * A value of DWT.DEFAULT indicates that no minimum width or
  * no minimum height is specified.
  *
  * @param width a minimum width for the control
@@ -93,7 +93,7 @@
 
 /**
  * Constructs a new instance of RowData according to the parameter.
- * A value of SWT.DEFAULT indicates that no minimum width or
+ * A value of DWT.DEFAULT indicates that no minimum width or
  * no minimum height is specified.
  *
  * @param point a point whose x coordinate specifies a minimum width for the control
@@ -118,8 +118,8 @@
  */
 public char[] toString () {
     char[] string = getName ()~" {";
-    if (width !is SWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
-    if (height !is SWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
+    if (width !is DWT.DEFAULT) string ~= "width="~to!(char[])(width)~" ";
+    if (height !is DWT.DEFAULT) string ~= "height="~to!(char[])(height)~" ";
     if (exclude) string ~= "exclude="~to!(char[])(exclude)~" ";
     string = trim( string );
     string ~= "}";
--- a/dwt/layout/RowLayout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/layout/RowLayout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.layout.RowLayout;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.widgets.Control;
@@ -44,7 +44,7 @@
  *      rowLayout.wrap = false;
  *      rowLayout.pack = false;
  *      rowLayout.justify = true;
- *      rowLayout.type = SWT.VERTICAL;
+ *      rowLayout.type = DWT.VERTICAL;
  *      rowLayout.marginLeft = 5;
  *      rowLayout.marginTop = 5;
  *      rowLayout.marginRight = 5;
@@ -75,7 +75,7 @@
      *
      * @since 2.0
      */
-    public int type = SWT.HORIZONTAL;
+    public int type = DWT.HORIZONTAL;
 
     /**
      * marginWidth specifies the number of pixels of horizontal margin
@@ -194,18 +194,18 @@
 
 protected Point computeSize (Composite composite, int wHint, int hHint, bool flushCache_) {
     Point extent;
-    if (type is SWT.HORIZONTAL) {
-        extent = layoutHorizontal (composite, false, (wHint !is SWT.DEFAULT) && wrap, wHint, flushCache_);
+    if (type is DWT.HORIZONTAL) {
+        extent = layoutHorizontal (composite, false, (wHint !is DWT.DEFAULT) && wrap, wHint, flushCache_);
     } else {
-        extent = layoutVertical (composite, false, (hHint !is SWT.DEFAULT) && wrap, hHint, flushCache_);
+        extent = layoutVertical (composite, false, (hHint !is DWT.DEFAULT) && wrap, hHint, flushCache_);
     }
-    if (wHint !is SWT.DEFAULT) extent.x = wHint;
-    if (hHint !is SWT.DEFAULT) extent.y = hHint;
+    if (wHint !is DWT.DEFAULT) extent.x = wHint;
+    if (hHint !is DWT.DEFAULT) extent.y = hHint;
     return extent;
 }
 
 Point computeSize (Control control, bool flushCache_) {
-    int wHint = SWT.DEFAULT, hHint = SWT.DEFAULT;
+    int wHint = DWT.DEFAULT, hHint = DWT.DEFAULT;
     RowData data = cast(RowData) control.getLayoutData ();
     if (data !is null) {
         wHint = data.width;
@@ -227,7 +227,7 @@
 
 protected void layout (Composite composite, bool flushCache_) {
     Rectangle clientArea = composite.getClientArea ();
-    if (type is SWT.HORIZONTAL) {
+    if (type is DWT.HORIZONTAL) {
         layoutHorizontal (composite, true, wrap, clientArea.width, flushCache_);
     } else {
         layoutVertical (composite, true, wrap, clientArea.height, flushCache_);
@@ -456,7 +456,7 @@
  */
 public char[] toString () {
     char[] string = getName ()~" {";
-    string ~= "type="~((type !is SWT.HORIZONTAL) ? "SWT.VERTICAL" : "SWT.HORIZONTAL")~" ";
+    string ~= "type="~((type !is DWT.HORIZONTAL) ? "DWT.VERTICAL" : "DWT.HORIZONTAL")~" ";
     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" ";
     if (marginHeight !is 0) string ~= "marginHeight="~to!(char[])(marginHeight)~" ";
     if (marginLeft !is 0) string ~= "marginLeft="~to!(char[])(marginLeft)~" ";
--- a/dwt/widgets/Button.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Button.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,7 +13,7 @@
 import dwt.widgets.Control;
 
 import dwt.internal.gtk.OS;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.graphics.Image;
 import dwt.widgets.ImageList;
@@ -45,7 +45,7 @@
  * when the ARROW style is specified.
  * </p><p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  */
 public class Button : Control {
@@ -60,10 +60,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -74,20 +74,20 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#ARROW
+ * @see DWT#CHECK
+ * @see DWT#PUSH
+ * @see DWT#RADIO
+ * @see DWT#TOGGLE
+ * @see DWT#FLAT
+ * @see DWT#LEFT
+ * @see DWT#RIGHT
+ * @see DWT#CENTER
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -96,16 +96,16 @@
 }
 
 static int checkStyle (int style) {
-    style = checkBits (style, SWT.PUSH, SWT.ARROW, SWT.CHECK, SWT.RADIO, SWT.TOGGLE, 0);
-    if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) {
-        return checkBits (style, SWT.CENTER, SWT.LEFT, SWT.RIGHT, 0, 0, 0);
+    style = checkBits (style, DWT.PUSH, DWT.ARROW, DWT.CHECK, DWT.RADIO, DWT.TOGGLE, 0);
+    if ((style & (DWT.PUSH | DWT.TOGGLE)) !is 0) {
+        return checkBits (style, DWT.CENTER, DWT.LEFT, DWT.RIGHT, 0, 0, 0);
     }
-    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
-        return checkBits (style, SWT.LEFT, SWT.RIGHT, SWT.CENTER, 0, 0, 0);
+    if ((style & (DWT.CHECK | DWT.RADIO)) !is 0) {
+        return checkBits (style, DWT.LEFT, DWT.RIGHT, DWT.CENTER, 0, 0, 0);
     }
-    if ((style & SWT.ARROW) !is 0) {
-        style |= SWT.NO_FOCUS;
-        return checkBits (style, SWT.UP, SWT.DOWN, SWT.LEFT, SWT.RIGHT, 0, 0);
+    if ((style & DWT.ARROW) !is 0) {
+        style |= DWT.NO_FOCUS;
+        return checkBits (style, DWT.UP, DWT.DOWN, DWT.LEFT, DWT.RIGHT, 0, 0);
     }
     return style;
 }
@@ -125,7 +125,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -136,16 +136,16 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     /*
     * Feature in GTK, GtkCheckButton and GtkRadioButton allocate
     * only the minimum size necessary for its child. This causes the child
@@ -154,15 +154,15 @@
     */
     forceResize ();
     int reqWidth = -1, reqHeight = -1;
-    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+    if ((style & (DWT.CHECK | DWT.RADIO)) !is 0) {
         OS.gtk_widget_get_size_request (boxHandle, &reqWidth, &reqHeight);
         OS.gtk_widget_set_size_request (boxHandle, -1, -1);
     }
     Point size = computeNativeSize (handle, wHint, hHint, changed);
-    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+    if ((style & (DWT.CHECK | DWT.RADIO)) !is 0) {
         OS.gtk_widget_set_size_request (boxHandle, reqWidth, reqHeight);
     }
-    if (wHint !is SWT.DEFAULT || hHint !is SWT.DEFAULT) {
+    if (wHint !is DWT.DEFAULT || hHint !is DWT.DEFAULT) {
         if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) !is 0) {
             GtkBorder border;
             GtkBorder* buffer;
@@ -173,8 +173,8 @@
                 /* Use the GTK+ default value of 1 for each. */
                 border.left = border.right = border.top = border.bottom = 1;
             }
-            if (wHint !is SWT.DEFAULT) size.x += border.left + border.right;
-            if (hHint !is SWT.DEFAULT) size.y += border.top + border.bottom;
+            if (wHint !is DWT.DEFAULT) size.x += border.left + border.right;
+            if (hHint !is DWT.DEFAULT) size.y += border.top + border.bottom;
         }
     }
     return size;
@@ -182,32 +182,32 @@
 
 override void createHandle (int index) {
     state |= HANDLE;
-    if ((style & SWT.PUSH) is 0) state |= THEME_BACKGROUND;
-    int bits = SWT.ARROW | SWT.TOGGLE | SWT.CHECK | SWT.RADIO | SWT.PUSH;
+    if ((style & DWT.PUSH) is 0) state |= THEME_BACKGROUND;
+    int bits = DWT.ARROW | DWT.TOGGLE | DWT.CHECK | DWT.RADIO | DWT.PUSH;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     switch (style & bits) {
-        case SWT.ARROW:
+        case DWT.ARROW:
             int arrow_type = OS.GTK_ARROW_UP;
-            if ((style & SWT.UP) !is 0) arrow_type = OS.GTK_ARROW_UP;
-            if ((style & SWT.DOWN) !is 0) arrow_type = OS.GTK_ARROW_DOWN;
-            if ((style & SWT.LEFT) !is 0) arrow_type = OS.GTK_ARROW_LEFT;
-            if ((style & SWT.RIGHT) !is 0) arrow_type = OS.GTK_ARROW_RIGHT;
+            if ((style & DWT.UP) !is 0) arrow_type = OS.GTK_ARROW_UP;
+            if ((style & DWT.DOWN) !is 0) arrow_type = OS.GTK_ARROW_DOWN;
+            if ((style & DWT.LEFT) !is 0) arrow_type = OS.GTK_ARROW_LEFT;
+            if ((style & DWT.RIGHT) !is 0) arrow_type = OS.GTK_ARROW_RIGHT;
             handle = OS.gtk_button_new ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             arrowHandle = OS.gtk_arrow_new (arrow_type, OS.GTK_SHADOW_OUT);
-            if (arrowHandle is null) error (SWT.ERROR_NO_HANDLES);
+            if (arrowHandle is null) error (DWT.ERROR_NO_HANDLES);
             break;
-        case SWT.TOGGLE:
+        case DWT.TOGGLE:
             handle = OS.gtk_toggle_button_new ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             break;
-        case SWT.CHECK:
+        case DWT.CHECK:
             handle = OS.gtk_check_button_new ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             break;
-        case SWT.RADIO:
+        case DWT.RADIO:
             /*
             * Feature in GTK.  In GTK, radio button must always be part of
             * a radio button group.  In a GTK radio group, one button is always
@@ -220,36 +220,36 @@
             * unselected.
             */
             groupHandle = cast(GtkWidget*)OS.gtk_radio_button_new (null);
-            if (groupHandle is null) error (SWT.ERROR_NO_HANDLES);
+            if (groupHandle is null) error (DWT.ERROR_NO_HANDLES);
             OS.g_object_ref (groupHandle);
             OS.gtk_object_sink (cast(GtkObject*)groupHandle);
             handle = OS.gtk_radio_button_new ( OS.gtk_radio_button_get_group (cast(GtkRadioButton*)groupHandle));
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             break;
-        case SWT.PUSH:
+        case DWT.PUSH:
         default:
             handle = OS.gtk_button_new ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_DEFAULT);
             break;
     }
-    if ((style & SWT.ARROW) !is 0) {
+    if ((style & DWT.ARROW) !is 0) {
         OS.gtk_container_add (cast(GtkContainer*)handle, arrowHandle);
     } else {
         boxHandle = OS.gtk_hbox_new (false, 4);
-        if (boxHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (boxHandle is null) error (DWT.ERROR_NO_HANDLES);
         labelHandle = OS.gtk_label_new_with_mnemonic (null);
-        if (labelHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (labelHandle is null) error (DWT.ERROR_NO_HANDLES);
         imageHandle = OS.gtk_image_new ();
-        if (imageHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (imageHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)handle, boxHandle);
         OS.gtk_container_add (cast(GtkContainer*)boxHandle, imageHandle);
         OS.gtk_container_add (cast(GtkContainer*)boxHandle, labelHandle);
     }
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
 
-    if ((style & SWT.ARROW) !is 0) return;
-    _setAlignment (style & (SWT.LEFT | SWT.CENTER | SWT.RIGHT));
+    if ((style & DWT.ARROW) !is 0) return;
+    _setAlignment (style & (DWT.LEFT | DWT.CENTER | DWT.RIGHT));
 }
 
 override void createWidget (int index) {
@@ -281,24 +281,24 @@
  *
  * @return the alignment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.ARROW) !is 0) {
-        if ((style & SWT.UP) !is 0) return SWT.UP;
-        if ((style & SWT.DOWN) !is 0) return SWT.DOWN;
-        if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
-        if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
-        return SWT.UP;
+    if ((style & DWT.ARROW) !is 0) {
+        if ((style & DWT.UP) !is 0) return DWT.UP;
+        if ((style & DWT.DOWN) !is 0) return DWT.DOWN;
+        if ((style & DWT.LEFT) !is 0) return DWT.LEFT;
+        if ((style & DWT.RIGHT) !is 0) return DWT.RIGHT;
+        return DWT.UP;
     }
-    if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
-    if ((style & SWT.CENTER) !is 0) return SWT.CENTER;
-    if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
-    return SWT.LEFT;
+    if ((style & DWT.LEFT) !is 0) return DWT.LEFT;
+    if ((style & DWT.CENTER) !is 0) return DWT.CENTER;
+    if ((style & DWT.RIGHT) !is 0) return DWT.RIGHT;
+    return DWT.LEFT;
 }
 
 /**
@@ -307,7 +307,7 @@
  *
  * @return the receiver's image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -332,14 +332,14 @@
  *
  * @return the selection state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool getSelection () {
     checkWidget ();
-    if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return false;
+    if ((style & (DWT.CHECK | DWT.RADIO | DWT.TOGGLE)) is 0) return false;
     return cast(bool)OS.gtk_toggle_button_get_active (cast(GtkToggleButton*)handle);
 }
 
@@ -350,33 +350,33 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 char[] getText () {
     checkWidget();
-    if ((style & SWT.ARROW) !is 0) return "";
+    if ((style & DWT.ARROW) !is 0) return "";
     return text;
 }
 
 override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
     auto result = super.gtk_button_press_event (widget, event);
     if (result !is 0) return result;
-    if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
+    if ((style & DWT.RADIO) !is 0) selected  = getSelection ();
     return result;
 }
 
 override int /*long*/ gtk_clicked (GtkWidget* widget) {
-    if ((style & SWT.RADIO) !is 0) {
-        if ((parent.getStyle () & SWT.NO_RADIO_GROUP) !is 0) {
+    if ((style & DWT.RADIO) !is 0) {
+        if ((parent.getStyle () & DWT.NO_RADIO_GROUP) !is 0) {
             setSelection (!selected);
         } else {
             selectRadio ();
         }
     }
-    postEvent (SWT.Selection);
+    postEvent (DWT.Selection);
     return 0;
 }
 
@@ -384,7 +384,7 @@
     auto result = super.gtk_focus_in_event (widget, event);
     // widget could be disposed at this point
     if (handle is null) return 0;
-    if ((style & SWT.PUSH) !is 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
+    if ((style & DWT.PUSH) !is 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
         Decorations menuShell = menuShell ();
         menuShell.defaultButton = this;
     }
@@ -395,7 +395,7 @@
     auto result = super.gtk_focus_out_event (widget, event);
     // widget could be disposed at this point
     if (handle is null) return 0;
-    if ((style & SWT.PUSH) !is 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
+    if ((style & DWT.PUSH) !is 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
         Decorations menuShell = menuShell ();
         if (menuShell.defaultButton is this) {
             menuShell.defaultButton = null;
@@ -407,7 +407,7 @@
 override int /*long*/ gtk_key_press_event (GtkWidget* widget, GdkEventKey* event) {
     auto result = super.gtk_key_press_event (widget, event);
     if (result !is 0) return result;
-    if ((style & SWT.RADIO) !is 0) selected  = getSelection ();
+    if ((style & DWT.RADIO) !is 0) selected  = getSelection ();
     return result;
 }
 
@@ -469,7 +469,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -479,10 +479,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 override void resizeHandle (int width, int height) {
@@ -493,7 +493,7 @@
     * alignment to fail. The fix is to set the child size to the size
     * of the button.
     */
-    if ((style & (SWT.CHECK | SWT.RADIO)) !is 0) {
+    if ((style & (DWT.CHECK | DWT.RADIO)) !is 0) {
         OS.gtk_widget_set_size_request (boxHandle, width, -1);
     }
 }
@@ -534,7 +534,7 @@
  *
  * @param alignment the new alignment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -545,32 +545,32 @@
 }
 
 void _setAlignment (int alignment) {
-    if ((style & SWT.ARROW) !is 0) {
-        if ((style & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT)) is 0) return;
-        style &= ~(SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
-        style |= alignment & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
+    if ((style & DWT.ARROW) !is 0) {
+        if ((style & (DWT.UP | DWT.DOWN | DWT.LEFT | DWT.RIGHT)) is 0) return;
+        style &= ~(DWT.UP | DWT.DOWN | DWT.LEFT | DWT.RIGHT);
+        style |= alignment & (DWT.UP | DWT.DOWN | DWT.LEFT | DWT.RIGHT);
         int arrow_type = OS.GTK_ARROW_UP;
-        bool isRTL = (style & SWT.RIGHT_TO_LEFT) !is 0;
+        bool isRTL = (style & DWT.RIGHT_TO_LEFT) !is 0;
         switch (alignment) {
-            case SWT.UP: arrow_type = OS.GTK_ARROW_UP; break;
-            case SWT.DOWN: arrow_type = OS.GTK_ARROW_DOWN; break;
-            case SWT.LEFT: arrow_type = isRTL ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT; break;
-            case SWT.RIGHT: arrow_type = isRTL ? OS.GTK_ARROW_LEFT : OS.GTK_ARROW_RIGHT; break;
+            case DWT.UP: arrow_type = OS.GTK_ARROW_UP; break;
+            case DWT.DOWN: arrow_type = OS.GTK_ARROW_DOWN; break;
+            case DWT.LEFT: arrow_type = isRTL ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT; break;
+            case DWT.RIGHT: arrow_type = isRTL ? OS.GTK_ARROW_LEFT : OS.GTK_ARROW_RIGHT; break;
             default:
         }
         OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, arrow_type, OS.GTK_SHADOW_OUT);
         return;
     }
-    if ((alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER)) is 0) return;
-    style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
-    style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
+    if ((alignment & (DWT.LEFT | DWT.RIGHT | DWT.CENTER)) is 0) return;
+    style &= ~(DWT.LEFT | DWT.RIGHT | DWT.CENTER);
+    style |= alignment & (DWT.LEFT | DWT.RIGHT | DWT.CENTER);
     /* Alignment not honoured when image and text are visible */
     bool bothVisible = OS.GTK_WIDGET_VISIBLE (labelHandle) && OS.GTK_WIDGET_VISIBLE (imageHandle);
     if (bothVisible) {
-        if ((style & (SWT.RADIO | SWT.CHECK)) !is 0) alignment = SWT.LEFT;
-        if ((style & (SWT.PUSH | SWT.TOGGLE)) !is 0) alignment = SWT.CENTER;
+        if ((style & (DWT.RADIO | DWT.CHECK)) !is 0) alignment = DWT.LEFT;
+        if ((style & (DWT.PUSH | DWT.TOGGLE)) !is 0) alignment = DWT.CENTER;
     }
-    if ((alignment & SWT.LEFT) !is 0) {
+    if ((alignment & DWT.LEFT) !is 0) {
         if (bothVisible) {
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_START);
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_START);
@@ -580,7 +580,7 @@
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.0f, 0.5f);
         return;
     }
-    if ((alignment & SWT.CENTER) !is 0) {
+    if ((alignment & DWT.CENTER) !is 0) {
         if (bothVisible) {
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
@@ -593,7 +593,7 @@
         }
         return;
     }
-    if ((alignment & SWT.RIGHT) !is 0) {
+    if ((alignment & DWT.RIGHT) !is 0) {
         if (bothVisible) {
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_END);
             OS.gtk_box_set_child_packing (cast(GtkBox*)boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_END);
@@ -620,10 +620,10 @@
 }
 
 override bool setRadioSelection (bool value) {
-    if ((style & SWT.RADIO) is 0) return false;
+    if ((style & DWT.RADIO) is 0) return false;
     if (getSelection () !is value) {
         setSelection (value);
-        postEvent (SWT.Selection);
+        postEvent (DWT.Selection);
     }
     return true;
 }
@@ -650,18 +650,18 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.ARROW) !is 0) return;
+    if ((style & DWT.ARROW) !is 0) return;
     if (imageList !is null) imageList.dispose ();
     imageList = null;
     if (image !is null) {
-        if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (image.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
         imageList = new ImageList ();
         int imageIndex = imageList.add (image);
         auto pixbuf = imageList.getPixbuf (imageIndex);
@@ -679,13 +679,13 @@
 
 override void setOrientation () {
     super.setOrientation ();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (labelHandle !is null) OS.gtk_widget_set_direction (labelHandle, OS.GTK_TEXT_DIR_RTL);
         if (imageHandle !is null) OS.gtk_widget_set_direction (imageHandle, OS.GTK_TEXT_DIR_RTL);
         if (arrowHandle !is null) {
-            switch (style & (SWT.LEFT | SWT.RIGHT)) {
-                case SWT.LEFT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_RIGHT, OS.GTK_SHADOW_OUT); break;
-                case SWT.RIGHT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_LEFT, OS.GTK_SHADOW_OUT); break;
+            switch (style & (DWT.LEFT | DWT.RIGHT)) {
+                case DWT.LEFT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_RIGHT, OS.GTK_SHADOW_OUT); break;
+                case DWT.RIGHT: OS.gtk_arrow_set (cast(GtkArrow*)arrowHandle, OS.GTK_ARROW_LEFT, OS.GTK_SHADOW_OUT); break;
                 default:
             }
         }
@@ -703,17 +703,17 @@
  *
  * @param selected the new selection state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (bool selected) {
     checkWidget();
-    if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) is 0) return;
+    if ((style & (DWT.CHECK | DWT.RADIO | DWT.TOGGLE)) is 0) return;
     OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCLICKED);
     OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)handle, selected);
-    if ((style & SWT.RADIO) !is 0) OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)groupHandle, !selected);
+    if ((style & DWT.RADIO) !is 0) OS.gtk_toggle_button_set_active (cast(GtkToggleButton*)groupHandle, !selected);
     OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCLICKED);
 }
 
@@ -743,15 +743,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.ARROW) !is 0) return;
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.ARROW) !is 0) return;
     text = string;
     char [] chars = fixMnemonic (string);
     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars));
@@ -770,7 +770,7 @@
 alias Control.traversalCode traversalCode;
 override int traversalCode (int key, GdkEventKey* event) {
     int code = super.traversalCode (key, event);
-    if ((style & SWT.RADIO) !is 0) code |= SWT.TRAVERSE_ARROW_NEXT | SWT.TRAVERSE_ARROW_PREVIOUS;
+    if ((style & DWT.RADIO) !is 0) code |= DWT.TRAVERSE_ARROW_NEXT | DWT.TRAVERSE_ARROW_PREVIOUS;
     return code;
 }
 
--- a/dwt/widgets/Canvas.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Canvas.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 
 import dwt.graphics.Point;
 import dwt.internal.gtk.OS;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.widgets.Composite;
 import dwt.widgets.Caret;
 import dwt.widgets.Control;
@@ -34,7 +34,7 @@
  * 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
+ * painted using DWT graphics calls or are handled by native
  * methods.
  * </p>
  *
@@ -50,10 +50,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -64,11 +64,11 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  * </ul>
  *
- * @see SWT
+ * @see DWT
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -90,7 +90,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the gc is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the gc has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -99,8 +99,8 @@
  */
 public void drawBackground (GC gc, int x, int y, int width, int height) {
     checkWidget ();
-    if (gc is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (gc is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if (gc.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
     super.drawBackground (gc, x, y, width, height);
 }
 
@@ -117,7 +117,7 @@
  *
  * @return the caret
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -185,7 +185,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -299,7 +299,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the caret has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -312,7 +312,7 @@
     if (hasFocus ()) {
         if (oldCaret !is null) oldCaret.killFocus ();
         if (newCaret !is null) {
-            if (newCaret.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+            if (newCaret.isDisposed()) error(DWT.ERROR_INVALID_ARGUMENT);
             newCaret.setFocus ();
         }
     }
--- a/dwt/widgets/Caret.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Caret.d	Tue Jan 15 06:44:34 2008 +0100
@@ -25,7 +25,7 @@
 }
 +/
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Image;
 import dwt.graphics.Font;
@@ -45,7 +45,7 @@
  * </dl>
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  */
 public class Caret : Widget {
@@ -61,10 +61,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -75,12 +75,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -139,7 +139,7 @@
  *
  * @return the receiver's bounding rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -158,7 +158,7 @@
  *
  * @return the receiver's font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -174,7 +174,7 @@
  *
  * @return the receiver's image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -190,7 +190,7 @@
  *
  * @return the receiver's location
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -205,7 +205,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -220,7 +220,7 @@
  *
  * @return the receiver's size
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -246,7 +246,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -269,7 +269,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -317,7 +317,7 @@
  * @param width the new width for the receiver
  * @param height the new height for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -341,14 +341,14 @@
  *
  * @param rect the new bounds for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (rect is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) error (DWT.ERROR_NULL_ARGUMENT);
     setBounds (rect.x, rect.y, rect.width, rect.height);
 }
 
@@ -368,7 +368,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the font has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -376,7 +376,7 @@
 public void setFont (Font font) {
     checkWidget();
     if (font !is null && font.isDisposed ()) {
-        error (SWT.ERROR_INVALID_ARGUMENT);
+        error (DWT.ERROR_INVALID_ARGUMENT);
     }
     this.font = font;
 }
@@ -391,7 +391,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -399,7 +399,7 @@
 public void setImage (Image image) {
     checkWidget();
     if (image !is null && image.isDisposed ()) {
-        error (SWT.ERROR_INVALID_ARGUMENT);
+        error (DWT.ERROR_INVALID_ARGUMENT);
     }
     bool isFocus = isFocusCaret ();
     if (isFocus && isVisible_) hideCaret ();
@@ -415,7 +415,7 @@
  * @param x the new x coordinate for the receiver
  * @param y the new y coordinate for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -432,14 +432,14 @@
  *
  * @param location the new location for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (location is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (location is null) error (DWT.ERROR_NULL_ARGUMENT);
     setLocation (location.x, location.y);
 }
 
@@ -449,7 +449,7 @@
  * @param width the new width for the receiver
  * @param height the new height for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -467,14 +467,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (size is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (size is null) error (DWT.ERROR_NULL_ARGUMENT);
     setSize (size.x, size.y);
 }
 
@@ -489,7 +489,7 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/Combo.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Combo.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.Combo;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.events.SelectionListener;
@@ -91,10 +91,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -105,14 +105,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#DROP_DOWN
+ * @see DWT#READ_ONLY
+ * @see DWT#SIMPLE
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -128,7 +128,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -137,7 +137,7 @@
  */
 public void add (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     add (string, items.length);
 }
 
@@ -157,7 +157,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -166,9 +166,9 @@
  */
 public void add (char[] string, int index) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (!(0 <= index && index <= items.length)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     char[] [] newItems = new char[][]( items.length + 1 );
     System.arraycopy (items, 0, newItems, 0, index);
@@ -209,7 +209,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -219,9 +219,9 @@
  */
 public void addModifyListener (ModifyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Modify, typedListener);
+    addListener (DWT.Modify, typedListener);
 }
 
 /**
@@ -239,7 +239,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -250,10 +250,10 @@
  */
 public void addSelectionListener(SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 /**
@@ -267,7 +267,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -279,9 +279,9 @@
  */
 public void addVerifyListener (VerifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Verify, typedListener);
+    addListener (DWT.Verify, typedListener);
 }
 
 static int checkStyle (int style) {
@@ -291,29 +291,29 @@
     * bits.  All combo boxes draw their own border and
     * do not use the standard Windows border styles.
     * Therefore, no matter what style bits are specified,
-    * clear the BORDER bits so that the SWT style will
+    * clear the BORDER bits so that the DWT style will
     * match the Windows widget.
     *
     * The Windows behavior is currently implemented on
     * all platforms.
     */
-    style &= ~SWT.BORDER;
+    style &= ~DWT.BORDER;
 
     /*
     * 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.
+    * the DWT style.
     */
-    style &= ~(SWT.H_SCROLL | SWT.V_SCROLL);
-    style = checkBits (style, SWT.DROP_DOWN, SWT.SIMPLE, 0, 0, 0, 0);
-    if ((style & SWT.SIMPLE) !is 0) return style & ~SWT.READ_ONLY;
+    style &= ~(DWT.H_SCROLL | DWT.V_SCROLL);
+    style = checkBits (style, DWT.DROP_DOWN, DWT.SIMPLE, 0, 0, 0, 0);
+    if ((style & DWT.SIMPLE) !is 0) return style & ~DWT.READ_ONLY;
     return style;
 }
 
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 /**
@@ -326,7 +326,7 @@
  * use <code>deselectAll()</code>.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -344,7 +344,7 @@
 void clearText () {
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
         OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
-        if ((style & SWT.READ_ONLY) !is 0) {
+        if ((style & DWT.READ_ONLY) !is 0) {
             int index = OS.gtk_combo_box_get_active (cast(GtkComboBox*)handle);
             if (index !is -1) {
                 auto modelHandle = OS.gtk_combo_box_get_model (cast(GtkComboBox*)handle);
@@ -352,7 +352,7 @@
                 GtkTreeIter iter;
                 OS.gtk_tree_model_iter_nth_child (cast(GtkTreeModel*)modelHandle, &iter, null, index);
                 OS.gtk_tree_model_get1 (cast(GtkTreeModel*)modelHandle, &iter, 0, cast(void**)&ptr );
-                if (fromUtf8z(ptr).length > 0) postEvent (SWT.Modify);
+                if (fromUtf8z(ptr).length > 0) postEvent (DWT.Modify);
                 OS.g_free (ptr);
             }
         } else {
@@ -369,8 +369,8 @@
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
         return computeNativeSize (handle, wHint, hHint, changed);
     }
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     int w, h;
     OS.gtk_widget_realize (entryHandle);
     auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)entryHandle);
@@ -396,8 +396,8 @@
     OS.gtk_widget_size_request (listParent !is null ? listParent : listHandle, &listRequesition);
 
     width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4;
-    width = wHint is SWT.DEFAULT ? width : wHint;
-    height = hHint is SWT.DEFAULT ? height : hHint;
+    width = wHint is DWT.DEFAULT ? width : wHint;
+    height = hHint is DWT.DEFAULT ? height : hHint;
     return new Point (width, height);
 }
 
@@ -407,7 +407,7 @@
  * The current selection is copied to the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -422,21 +422,21 @@
 void createHandle (int index) {
     state |= HANDLE | MENU;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
-        if ((style & SWT.READ_ONLY) !is 0) {
+        if ((style & DWT.READ_ONLY) !is 0) {
             handle = cast(GtkWidget*)OS.gtk_combo_box_new_text ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
         } else {
             handle = cast(GtkWidget*)OS.gtk_combo_box_entry_new_text ();
-            if (handle is null) error (SWT.ERROR_NO_HANDLES);
+            if (handle is null) error (DWT.ERROR_NO_HANDLES);
             entryHandle = cast(GtkWidget*)OS.gtk_bin_get_child (cast(GtkBin*)handle);
-            if (entryHandle is null) error (SWT.ERROR_NO_HANDLES);
+            if (entryHandle is null) error (DWT.ERROR_NO_HANDLES);
         }
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
         textRenderer = cast(GtkWidget*)OS.gtk_cell_renderer_text_new ();
-        if (textRenderer is null) error (SWT.ERROR_NO_HANDLES);
+        if (textRenderer is null) error (DWT.ERROR_NO_HANDLES);
         /*
         * Feature in GTK. In order to make a read only combo box the same
         * height as an editable combo box the ypad must be set to 0. In
@@ -481,7 +481,7 @@
         }
     } else {
         handle = cast(GtkWidget*)OS.gtk_combo_new ();
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
         GtkCombo* combo = cast(GtkCombo*)handle;
         entryHandle = combo.entry;
@@ -508,7 +508,7 @@
             OS.g_list_free (list);
         }
 
-        bool editable = (style & SWT.READ_ONLY) is 0;
+        bool editable = (style & DWT.READ_ONLY) is 0;
         OS.gtk_editable_set_editable (cast(GtkEditable*)entryHandle, editable);
         OS.gtk_combo_disable_activate (cast(GtkCombo*)handle);
         OS.gtk_combo_set_case_sensitive (cast(GtkCombo*)handle, true);
@@ -522,7 +522,7 @@
  * clipboard and then deleted from the widget.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -560,10 +560,10 @@
     /*
     *  The IM filter has to be called one time for each key press event.
     *  When the IM is open the key events are duplicated. The first event
-    *  is filtered by SWT and the second event is filtered by GTK.  In some
+    *  is filtered by DWT and the second event is filtered by GTK.  In some
     *  cases the GTK handler does not run (the widget is destroyed, the
     *  application code consumes the event, etc), for these cases the IM
-    *  filter has to be called by SWT.
+    *  filter has to be called by DWT.
     */
     if (gdkEventKey !is null && gdkEventKey !is cast(GdkEventKey*)-1) {
         auto imContext = imContext ();
@@ -583,7 +583,7 @@
 
 override GtkWidget* focusHandle () {
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
-        if ((style & SWT.READ_ONLY) !is 0 && buttonHandle !is null) return buttonHandle;
+        if ((style & DWT.READ_ONLY) !is 0 && buttonHandle !is null) return buttonHandle;
     }
     if (entryHandle !is null) return entryHandle;
     return super.focusHandle ();
@@ -622,7 +622,7 @@
             /*
             * Feature in GTK.  Events such as mouse move are propagated up
             * the widget hierarchy and are seen by the parent.  This is the
-            * correct GTK behavior but not correct for SWT.  The fix is to
+            * correct GTK behavior but not correct for DWT.  The fix is to
             * hook a signal after and stop the propagation using a negative
             * event number to distinguish this case.
             */
@@ -656,7 +656,7 @@
  *
  * @param index the index of the item to deselect
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -689,7 +689,7 @@
  * use <code>clearSelection()</code>.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -756,7 +756,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -764,7 +764,7 @@
 public char[] getItem (int index) {
     checkWidget();
     if (!(0 <= index && index < items.length)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     return items [index];
 }
@@ -774,7 +774,7 @@
  *
  * @return the number of items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -790,7 +790,7 @@
  *
  * @return the height of one item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -811,7 +811,7 @@
  *
  * @return the items in the receiver's list
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -828,7 +828,7 @@
  *
  * @return the orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -837,7 +837,7 @@
  */
 public int getOrientation () {
     checkWidget();
-    return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
+    return style & (DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT);
 }
 
 /**
@@ -854,14 +854,14 @@
  *
  * @return a point representing the selection start and end
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.READ_ONLY) !is 0) {
+    if ((style & DWT.READ_ONLY) !is 0) {
         int length = 0;
         if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
             int index = OS.gtk_combo_box_get_active (cast(GtkComboBox*)handle);
@@ -886,7 +886,7 @@
  *
  * @return the index of the selected item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -919,7 +919,7 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -950,7 +950,7 @@
  *
  * @return the text height
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -970,7 +970,7 @@
  *
  * @return the text limit
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -993,7 +993,7 @@
  *
  * @return the number of items that are visible
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1006,7 +1006,7 @@
 }
 
 override int /*long*/ gtk_activate (GtkWidget* widget) {
-    postEvent (SWT.DefaultSelection);
+    postEvent (DWT.DefaultSelection);
     return 0;
 }
 
@@ -1014,7 +1014,7 @@
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
         if (widget is handle) {
             if (entryHandle is null) {
-                sendEvent(SWT.Modify);
+                sendEvent(DWT.Modify);
                 if (isDisposed ()) return 0;
             }
             /*
@@ -1029,7 +1029,7 @@
             * item and not matching the item as the user types.
             */
             int index = OS.gtk_combo_box_get_active (cast(GtkComboBox*)handle);
-            if (index !is -1) postEvent (SWT.Selection);
+            if (index !is -1) postEvent (DWT.Selection);
             return 0;
         }
     } else {
@@ -1038,7 +1038,7 @@
             char[] text = fromUtf8z(ptr).dup;
             for (int i = 0; i < items.length; i++) {
                 if (items [i] ==/*eq*/ text) {
-                    postEvent (SWT.Selection);
+                    postEvent (DWT.Selection);
                     break;
                 }
             }
@@ -1064,9 +1064,9 @@
         OS.gdk_event_free (eventPtr);
     }
     if (keyPress) {
-        postEvent (SWT.Modify);
+        postEvent (DWT.Modify);
     } else {
-        sendEvent (SWT.Modify);
+        sendEvent (DWT.Modify);
     }
     return 0;
 }
@@ -1076,7 +1076,7 @@
     if (!OS.gtk_editable_get_editable (cast(GtkEditable*)entryHandle)) return 0;
     char [] chars = fromUtf8z(text);
     if (chars.length is 0) return 0;
-    char [] newChars = sendIMKeyEvent (SWT.KeyDown, null, chars);
+    char [] newChars = sendIMKeyEvent (DWT.KeyDown, null, chars);
     if (newChars is null) return 0;
     /*
     * Feature in GTK.  For a GtkEntry, during the insert-text signal,
@@ -1111,7 +1111,7 @@
         OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text.ptr);
         return 0;
     }
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     char[] newText = verifyText ("", cast(int)/*64*/start_pos, cast(int)/*64*/end_pos);
     if (newText is null) {
         OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text.ptr);
@@ -1141,7 +1141,7 @@
         OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text.ptr);
         return 0;
     }
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     if (new_text is null || new_text_length is 0) return 0;
     char[] oldText = new_text[0..new_text_length];
     int pos;
@@ -1198,7 +1198,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1222,14 +1222,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string, int start) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (!(0 <= start && start < items.length)) return -1;
     for (int i=start; i<items.length; i++) {
         if (string==/*eq*/items [i]) return i;
@@ -1242,7 +1242,7 @@
     OS.gtk_widget_realize (childHandle);
     auto window = OS.GTK_WIDGET_WINDOW (childHandle);
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
-        if ((style & SWT.READ_ONLY) !is 0) return window;
+        if ((style & DWT.READ_ONLY) !is 0) return window;
     }
     auto children = OS.gdk_window_get_children (window);
     if (children !is null) window = cast(GdkDrawable*)OS.g_list_data (children);
@@ -1257,7 +1257,7 @@
  * and new text inserted from the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1302,7 +1302,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1310,7 +1310,7 @@
 public void remove (int index) {
     checkWidget();
     if (!(0 <= index && index < items.length)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     char[] [] oldItems = items;
     char[] [] newItems = new char[][]( oldItems.length - 1 );
@@ -1347,7 +1347,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1356,7 +1356,7 @@
     checkWidget();
     if (start > end) return;
     if (!(0 <= start && start <= end && end < items.length)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     char[] [] oldItems = items;
     char[] [] newItems = new char[][](oldItems.length - (end - start + 1));
@@ -1400,16 +1400,16 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 remove (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     int index = indexOf (string, 0);
-    if (index is -1) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (index is -1) error (DWT.ERROR_INVALID_ARGUMENT);
     remove (index);
 }
 
@@ -1417,7 +1417,7 @@
  * Removes all of the items from the receiver's list and clear the
  * contents of receiver's text field.
  * <p>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1448,7 +1448,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1458,9 +1458,9 @@
  */
 public void removeModifyListener (ModifyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Modify, listener);
+    eventTable.unhook (DWT.Modify, listener);
 }
 
 /**
@@ -1472,7 +1472,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1482,10 +1482,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 /**
@@ -1497,7 +1497,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1509,9 +1509,9 @@
  */
 public void removeVerifyListener (VerifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Verify, listener);
+    eventTable.unhook (DWT.Verify, listener);
 }
 
 /**
@@ -1521,7 +1521,7 @@
  *
  * @param index the index of the item to select
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1561,7 +1561,7 @@
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
         if (entryHandle !is null) OS.gtk_widget_modify_font (entryHandle, font);
         OS.g_object_set1 (textRenderer, OS.font_desc.ptr, cast(int)font);
-        if ((style & SWT.READ_ONLY) !is 0) {
+        if ((style & DWT.READ_ONLY) !is 0) {
             /*
             * Bug in GTK.  Setting the font can leave the combo box with an
             * invalid minimum size.  The fix is to temporarily change the
@@ -1624,16 +1624,16 @@
  *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setItem (int index, char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (!(0 <= index && index < items.length)) {
-        error (SWT.ERROR_INVALID_ARGUMENT);
+        error (DWT.ERROR_INVALID_ARGUMENT);
     }
     items [index] = string;
     char* buffer = toStringz(string);
@@ -1660,16 +1660,16 @@
  *    <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if an item in the items array is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setItems (char[] [] items) {
     checkWidget();
-    if (items is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (items is null) error (DWT.ERROR_NULL_ARGUMENT);
     for (int i=0; i<items.length; i++) {
-        if (items [i] is null) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (items [i] is null) error (DWT.ERROR_INVALID_ARGUMENT);
     }
     int count = this.items.length;
     this.items = new char[][](items.length);
@@ -1721,7 +1721,7 @@
 
 void setOrientation() {
     super.setOrientation();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (listHandle !is null) OS.gtk_widget_set_direction (listHandle, OS.GTK_TEXT_DIR_RTL);
         if (entryHandle !is null) OS.gtk_widget_set_direction (entryHandle, OS.GTK_TEXT_DIR_RTL);
     }
@@ -1729,12 +1729,12 @@
 
 /**
  * Sets the orientation of the receiver, which must be one
- * of the constants <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
+ * of the constants <code>DWT.LEFT_TO_RIGHT</code> or <code>DWT.RIGHT_TO_LEFT</code>.
  * <p>
  *
  * @param orientation new orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1743,11 +1743,11 @@
  */
 public void setOrientation (int orientation) {
     checkWidget();
-    int flags = SWT.RIGHT_TO_LEFT | SWT.LEFT_TO_RIGHT;
+    int flags = DWT.RIGHT_TO_LEFT | DWT.LEFT_TO_RIGHT;
     if ((orientation & flags) is 0 || (orientation & flags) is flags) return;
     style &= ~flags;
     style |= orientation & flags;
-    int dir = (orientation & SWT.RIGHT_TO_LEFT) !is 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
+    int dir = (orientation & DWT.RIGHT_TO_LEFT) !is 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
     OS.gtk_widget_set_direction (fixedHandle, dir);
     OS.gtk_widget_set_direction (handle, dir);
     if (entryHandle !is null) OS.gtk_widget_set_direction (entryHandle, dir);
@@ -1776,15 +1776,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (selection is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.READ_ONLY) !is 0) return;
+    if (selection is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.READ_ONLY) !is 0) return;
     if (entryHandle !is null) {
         OS.gtk_editable_set_position (cast(GtkEditable*)entryHandle, selection.x);
         OS.gtk_editable_select_region (cast(GtkEditable*)entryHandle, selection.x, selection.y);
@@ -1807,15 +1807,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.READ_ONLY) !is 0) {
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.READ_ONLY) !is 0) {
         int index = indexOf (string);
         if (index is -1) return;
         if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
@@ -1830,7 +1830,7 @@
     * insertion of the text.  This is not wrong, but is inconsistent with other platforms.  The
     * fix is to block the firing of these events and fire them ourselves in a consistent manner.
     */
-    if (hooks (SWT.Verify) || filters (SWT.Verify)) {
+    if (hooks (DWT.Verify) || filters (DWT.Verify)) {
         auto ptr = OS.gtk_entry_get_text (cast(GtkEntry*)entryHandle);
         string = verifyText (string, 0, cast(int)/*64*/OS.g_utf8_strlen (ptr, -1));
         if (string is null) return;
@@ -1849,7 +1849,7 @@
     OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
     OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udDELETE_TEXT);
     OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udINSERT_TEXT);
-    sendEvent (SWT.Modify);
+    sendEvent (DWT.Modify);
 }
 
 /**
@@ -1865,7 +1865,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1874,7 +1874,7 @@
  */
 public void setTextLimit (int limit) {
     checkWidget();
-    if (limit is 0) error (SWT.ERROR_CANNOT_BE_ZERO);
+    if (limit is 0) error (DWT.ERROR_CANNOT_BE_ZERO);
     if (entryHandle !is null) OS.gtk_entry_set_max_length (cast(GtkEntry*)entryHandle, limit);
 }
 
@@ -1893,7 +1893,7 @@
  *
  * @param count the new number of items to be visible
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1950,7 +1950,7 @@
      * event.  If this happens, answer null to cancel
      * the operation.
      */
-    sendEvent (SWT.Verify, event);
+    sendEvent (DWT.Verify, event);
     if (!event.doit || isDisposed ()) return null;
     return event.text;
 }
--- a/dwt/widgets/Composite.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Composite.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -24,7 +24,7 @@
 
 import dwt.internal.gtk.OS;
 import dwt.graphics.GC;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.cairo.Cairo;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Rectangle;
@@ -49,7 +49,7 @@
  * </p><p>
  * Note: The <code>CENTER</code> style, although undefined for composites, has the
  * same value as <code>EMBEDDED</code> (which is used to embed widgets from other
- * widget toolkits into SWT).  On some operating systems (GTK, Motif), this may cause
+ * widget toolkits into DWT).  On some operating systems (GTK, Motif), this may cause
  * the children of this composite to be obscured.  The <code>EMBEDDED</code> style
  * is for use by other widget toolkits and should normally never be used.
  * </p><p>
@@ -79,10 +79,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -93,15 +93,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#NO_BACKGROUND
+ * @see DWT#NO_FOCUS
+ * @see DWT#NO_MERGE_PAINTS
+ * @see DWT#NO_REDRAW_RESIZE
+ * @see DWT#NO_RADIO_GROUP
  * @see Widget#getStyle
  */
 public this (Composite parent, int style) {
@@ -164,7 +164,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the changed array is null any of its controls are null or have been disposed</li>
  *    <li>ERROR_INVALID_PARENT - if any control in changed is not in the widget tree of the receiver</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -173,11 +173,11 @@
  */
 public void changed (Control[] changed) {
     checkWidget ();
-    if (changed is null) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (changed is null) error (DWT.ERROR_INVALID_ARGUMENT);
     for (int i=0; i<changed.length; i++) {
         Control control = changed [i];
-        if (control is null) error (SWT.ERROR_INVALID_ARGUMENT);
-        if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (control is null) error (DWT.ERROR_INVALID_ARGUMENT);
+        if (control.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
         bool ancestor = false;
         Composite composite = control.parent;
         while (composite !is null) {
@@ -185,7 +185,7 @@
             if (ancestor) break;
             composite = composite.parent;
         }
-        if (!ancestor) error (SWT.ERROR_INVALID_PARENT);
+        if (!ancestor) error (DWT.ERROR_INVALID_PARENT);
     }
     for (int i=0; i<changed.length; i++) {
         Control child = changed [i];
@@ -201,7 +201,7 @@
 }
 
 override void checkBuffered () {
-    if ((style & SWT.DOUBLE_BUFFERED) is 0 && (style & SWT.NO_BACKGROUND) !is 0) {
+    if ((style & DWT.DOUBLE_BUFFERED) is 0 && (style & DWT.NO_BACKGROUND) !is 0) {
         return;
     }
     super.checkBuffered();
@@ -218,11 +218,11 @@
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     Point size;
     if (layout_ !is null) {
-        if (wHint is SWT.DEFAULT || hHint is SWT.DEFAULT) {
+        if (wHint is DWT.DEFAULT || hHint is DWT.DEFAULT) {
             changed |= (state & LAYOUT_CHANGED) !is 0;
             size = layout_.computeSize (this, wHint, hHint, changed);
             state &= ~LAYOUT_CHANGED;
@@ -234,8 +234,8 @@
     }
     if (size.x is 0) size.x = DEFAULT_WIDTH;
     if (size.y is 0) size.y = DEFAULT_HEIGHT;
-    if (wHint !is SWT.DEFAULT) size.x = wHint;
-    if (hHint !is SWT.DEFAULT) size.y = hHint;
+    if (wHint !is DWT.DEFAULT) size.x = wHint;
+    if (hHint !is DWT.DEFAULT) size.y = hHint;
     Rectangle trim = computeTrim (0, 0, size.x, size.y);
     return new Point (trim.width, trim.height);
 }
@@ -259,35 +259,35 @@
 
 override void createHandle (int index) {
     state |= HANDLE | CANVAS;
-    bool scrolled = (style & (SWT.H_SCROLL | SWT.V_SCROLL)) !is 0;
+    bool scrolled = (style & (DWT.H_SCROLL | DWT.V_SCROLL)) !is 0;
     if (!scrolled) state |= THEME_BACKGROUND;
-    createHandle (index, true, scrolled || (style & SWT.BORDER) !is 0);
+    createHandle (index, true, scrolled || (style & DWT.BORDER) !is 0);
 }
 
 void createHandle (int index, bool fixed, bool scrolled) {
     if (scrolled) {
         if (fixed) {
             fixedHandle = cast(GtkWidget*) OS.g_object_new (display.gtk_fixed_get_type (), null);
-            if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+            if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
             OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
         }
         auto vadj = cast(GtkAdjustment*)OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
-        if (vadj is null) error (SWT.ERROR_NO_HANDLES);
+        if (vadj is null) error (DWT.ERROR_NO_HANDLES);
         auto hadj = cast(GtkAdjustment*)OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
-        if (hadj is null) error (SWT.ERROR_NO_HANDLES);
+        if (hadj is null) error (DWT.ERROR_NO_HANDLES);
         scrolledHandle = cast(GtkWidget*) OS.gtk_scrolled_window_new (hadj, vadj);
-        if (scrolledHandle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (scrolledHandle is null) DWT.error (DWT.ERROR_NO_HANDLES);
     }
     handle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (handle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) DWT.error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)handle, true);
     OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_FOCUS);
-    if ((style & SWT.EMBEDDED) is 0) {
-        if ((state & CANVAS) !is 0 && (style & SWT.NO_FOCUS) is 0) {
+    if ((style & DWT.EMBEDDED) is 0) {
+        if ((state & CANVAS) !is 0 && (style & DWT.NO_FOCUS) is 0) {
             /* Prevent an input method context from being created for the Browser widget */
             if (display.getData (NO_INPUT_METHOD) is null) {
                 imHandle_ = OS.gtk_im_multicontext_new ();
-                if (imHandle_ is null) error (SWT.ERROR_NO_HANDLES);
+                if (imHandle_ is null) error (DWT.ERROR_NO_HANDLES);
             }
         }
     }
@@ -303,19 +303,19 @@
         OS.gtk_container_add (cast(GtkContainer*)scrolledHandle, handle);
         display.setWarnings (warnings);
 
-        int hsp = (style & SWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-        int vsp = (style & SWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
+        int hsp = (style & DWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
+        int vsp = (style & DWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
         OS.gtk_scrolled_window_set_policy (cast(GtkScrolledWindow*)scrolledHandle, hsp, vsp);
         if (hasBorder ()) {
             OS.gtk_scrolled_window_set_shadow_type (cast(GtkScrolledWindow*)scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
         }
     }
-    if ((style & SWT.EMBEDDED) !is 0) {
+    if ((style & DWT.EMBEDDED) !is 0) {
         socketHandle = OS.gtk_socket_new ();
-        if (socketHandle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (socketHandle is null) DWT.error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)handle, cast(GtkWidget*)socketHandle);
     }
-    if ((style & SWT.NO_REDRAW_RESIZE) !is 0) {
+    if ((style & DWT.NO_REDRAW_RESIZE) !is 0) {
         OS.gtk_widget_set_redraw_on_allocate (handle, false);
     }
     /*
@@ -327,7 +327,7 @@
     * when NO_BACKGROUND is set and DOUBLE_BUFFERED
     * is not explicitly set.
     */
-    if ((style & SWT.DOUBLE_BUFFERED) is 0 && (style & SWT.NO_BACKGROUND) !is 0) {
+    if ((style & DWT.DOUBLE_BUFFERED) is 0 && (style & DWT.NO_BACKGROUND) !is 0) {
         OS.gtk_widget_set_double_buffered (handle, false);
     }
 }
@@ -356,9 +356,9 @@
                 int w, h;
                 OS.gdk_drawable_get_size (cast(GdkDrawable*)drawable, &w, &h);
                 auto surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w, h);
-                if (surface is null) error (SWT.ERROR_NO_HANDLES);
+                if (surface is null) error (DWT.ERROR_NO_HANDLES);
                 auto pattern = Cairo.cairo_pattern_create_for_surface (surface);
-                if (pattern is null) error (SWT.ERROR_NO_HANDLES);
+                if (pattern is null) error (DWT.ERROR_NO_HANDLES);
                 Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
                 Cairo.cairo_set_source (cairo, pattern);
                 Cairo.cairo_surface_destroy (surface);
@@ -498,18 +498,18 @@
 /**
  * Returns the receiver's background drawing mode. This
  * will be one of the following constants defined in class
- * <code>SWT</code>:
+ * <code>DWT</code>:
  * <code>INHERIT_NONE</code>, <code>INHERIT_DEFAULT</code>,
  * <code>INHERTIT_FORCE</code>.
  *
  * @return the background mode
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  *
  * @since 3.2
  */
@@ -534,7 +534,7 @@
  * @see Control#moveAbove
  * @see Control#moveBelow
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -577,7 +577,7 @@
  *
  * @return the receiver's layout or null
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -593,7 +593,7 @@
  *
  * @return the receiver's deferred layout state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -613,7 +613,7 @@
  *
  * @return tabList the ordered list of controls representing the tab order
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -644,7 +644,7 @@
     auto result = super.gtk_button_press_event (widget, event);
     if (result !is 0) return result;
     if ((state & CANVAS) !is 0) {
-        if ((style & SWT.NO_FOCUS) is 0 && hooksKeys ()) {
+        if ((style & DWT.NO_FOCUS) is 0 && hooksKeys ()) {
             if (event.button is 1) {
                 if (getChildrenCount () is 0) setFocus ();
             }
@@ -658,10 +658,10 @@
     if ((state & CANVAS) is 0) {
         return super.gtk_expose_event (widget, eventPtr);
     }
-    if ((style & SWT.NO_MERGE_PAINTS) is 0) {
+    if ((style & DWT.NO_MERGE_PAINTS) is 0) {
         return super.gtk_expose_event (widget, eventPtr);
     }
-    if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
+    if (!hooks (DWT.Paint) && !filters (DWT.Paint)) return 0;
     GdkEventExpose* gdkEvent = eventPtr;
     GdkRectangle* rectangles;
     int n_rectangles;
@@ -678,7 +678,7 @@
         data.damageRgn = damageRgn;
         GC gc = event.gc = GC.gtk_new (this, data);
         OS.gdk_gc_set_clip_region (gc.handle, damageRgn);
-        sendEvent (SWT.Paint, event);
+        sendEvent (DWT.Paint, event);
         gc.dispose ();
         OS.gdk_region_destroy (damageRgn);
         event.gc = null;
@@ -730,7 +730,7 @@
 
 override int /*long*/ gtk_realize (GtkWidget* widget) {
     auto result = super.gtk_realize (widget);
-    if ((style & SWT.NO_BACKGROUND) !is 0) {
+    if ((style & DWT.NO_BACKGROUND) !is 0) {
         auto window = OS.GTK_WIDGET_WINDOW (paintHandle ());
         if (window !is null) OS.gdk_window_set_back_pixmap (window, null, false);
     }
@@ -748,7 +748,7 @@
 
 override int /*long*/ gtk_style_set (GtkWidget* widget, int /*long*/ previousStyle) {
     auto result = super.gtk_style_set (widget, previousStyle);
-    if ((style & SWT.NO_BACKGROUND) !is 0) {
+    if ((style & DWT.NO_BACKGROUND) !is 0) {
         auto window = OS.GTK_WIDGET_WINDOW (paintHandle ());
         if (window !is null) OS.gdk_window_set_back_pixmap (window, null, false);
     }
@@ -756,7 +756,7 @@
 }
 
 bool hasBorder () {
-    return (style & SWT.BORDER) !is 0;
+    return (style & DWT.BORDER) !is 0;
 }
 
 override void hookEvents () {
@@ -770,7 +770,7 @@
 }
 
 bool hooksKeys () {
-    return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
+    return hooks (DWT.KeyDown) || hooks (DWT.KeyUp);
 }
 
 override GtkIMContext* imHandle () {
@@ -785,7 +785,7 @@
  *
  * @return the receiver's deferred layout state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -819,7 +819,7 @@
  * affected, the parent will not paint.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -855,7 +855,7 @@
  *
  * @param changed <code>true</code> if the layout must flush its caches, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -894,7 +894,7 @@
  * @param changed <code>true</code> if the layout must flush its caches, and <code>false</code> otherwise
  * @param all <code>true</code> if all children in the receiver's widget tree should be laid out, and <code>false</code> otherwise
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -929,7 +929,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the changed array is null any of its controls are null or have been disposed</li>
  *    <li>ERROR_INVALID_PARENT - if any control in changed is not in the widget tree of the receiver</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -938,11 +938,11 @@
  */
 public void layout (Control [] changed) {
     checkWidget ();
-    if (changed is null) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (changed is null) error (DWT.ERROR_INVALID_ARGUMENT);
     for (int i=0; i<changed.length; i++) {
         Control control = changed [i];
-        if (control is null) error (SWT.ERROR_INVALID_ARGUMENT);
-        if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (control is null) error (DWT.ERROR_INVALID_ARGUMENT);
+        if (control.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
         bool ancestor = false;
         Composite composite = control.parent;
         while (composite !is null) {
@@ -950,7 +950,7 @@
             if (ancestor) break;
             composite = composite.parent;
         }
-        if (!ancestor) error (SWT.ERROR_INVALID_PARENT);
+        if (!ancestor) error (DWT.ERROR_INVALID_PARENT);
     }
     int updateCount = 0;
     Composite [] update = new Composite [16];
@@ -1143,18 +1143,18 @@
 
 /**
  * Sets the background drawing mode to the argument which should
- * be one of the following constants defined in class <code>SWT</code>:
+ * be one of the following constants defined in class <code>DWT</code>:
  * <code>INHERIT_NONE</code>, <code>INHERIT_DEFAULT</code>,
  * <code>INHERIT_FORCE</code>.
  *
  * @param mode the new background mode
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  *
  * @since 3.2
  */
@@ -1193,7 +1193,7 @@
  *
  * @param layout the receiver's new layout or null
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1215,7 +1215,7 @@
  *
  * @param defer the new defer state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1248,7 +1248,7 @@
 
 override bool setTabGroupFocus (bool next) {
     if (isTabItem ()) return setTabItemFocus (next);
-    bool takeFocus = (style & SWT.NO_FOCUS) is 0;
+    bool takeFocus = (style & DWT.NO_FOCUS) is 0;
     if ((state & CANVAS) !is 0) takeFocus = hooksKeys ();
     if (socketHandle !is null) takeFocus = true;
     if (takeFocus  && setTabItemFocus (next)) return true;
@@ -1281,7 +1281,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1291,9 +1291,9 @@
     if (tabList !is null) {
         for (int i=0; i<tabList.length; i++) {
             Control control = tabList [i];
-            if (control is null) error (SWT.ERROR_INVALID_ARGUMENT);
-            if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
-            if (control.parent !is this) error (SWT.ERROR_INVALID_PARENT);
+            if (control is null) error (DWT.ERROR_INVALID_ARGUMENT);
+            if (control.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
+            if (control.parent !is this) error (DWT.ERROR_INVALID_PARENT);
         }
         Control [] newList = new Control [tabList.length];
         System.arraycopy (tabList, 0, newList, 0, tabList.length);
@@ -1325,7 +1325,7 @@
 
 override int traversalCode(int key, GdkEventKey* event) {
     if ((state & CANVAS) !is 0) {
-        if ((style & SWT.NO_FOCUS) !is 0) return 0;
+        if ((style & DWT.NO_FOCUS) !is 0) return 0;
         if (hooksKeys ()) return 0;
     }
     return super.traversalCode (key, event);
--- a/dwt/widgets/Control.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Control.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.Control;
 
 
-import dwt.SWT;
+import dwt.DWT;
 //import dwt.accessibility.Accessible;
 import dwt.events.ControlListener;
 import dwt.events.FocusListener;
@@ -36,7 +36,7 @@
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.internal.Converter;
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 import dwt.internal.accessibility.gtk.ATK;
 import dwt.internal.gtk.OS;
 import dwt.widgets.Composite;
@@ -72,7 +72,7 @@
  * Only one of LEFT_TO_RIGHT or RIGHT_TO_LEFT may be specified.
  * </p><p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  */
 public abstract class Control : Widget, Drawable {
@@ -97,10 +97,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -111,12 +111,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#BORDER
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -185,11 +185,11 @@
 void fixStyle (GtkWidget* handle) {
     /*
     * Feature in GTK.  Some GTK themes apply a different background to
-    * the contents of a GtkNotebook.  However, in an SWT TabFolder, the
+    * the contents of a GtkNotebook.  However, in an DWT TabFolder, the
     * children are not parented below the GtkNotebook widget, and usually
     * have their own GtkFixed.  The fix is to look up the correct style
     * for a child of a GtkNotebook and apply its background to any GtkFixed
-    * widgets that are direct children of an SWT TabFolder.
+    * widgets that are direct children of an DWT TabFolder.
     *
     * Note that this has to be when the theme settings changes and that it
     * should not override the application background.
@@ -248,7 +248,7 @@
     /*
     * Feature in GTK.  Events such as mouse move are propagate up
     * the widget hierarchy and are seen by the parent.  This is the
-    * correct GTK behavior but not correct for SWT.  The fix is to
+    * correct GTK behavior but not correct for DWT.  The fix is to
     * hook a signal after and stop the propagation using a negative
     * event number to distinguish this case.
     *
@@ -293,7 +293,7 @@
     int x, y;
     int mask;
     OS.gdk_window_get_pointer (null, &x, &y, &mask);
-    sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x , y , false, mask );
+    sendMouseEvent (DWT.MouseHover, 0, /*time*/0, x , y , false, mask );
     /* Always return zero in order to cancel the hover timer */
     return 0;
 }
@@ -327,14 +327,14 @@
  * 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.
+ * dimension, the constant <code>DWT.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>)
+ * @param wHint the width hint (can be <code>DWT.DEFAULT</code>)
+ * @param hHint the height hint (can be <code>DWT.DEFAULT</code>)
  * @return the preferred size of the control
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -380,7 +380,7 @@
 }
 
 void checkBuffered () {
-    style |= SWT.DOUBLE_BUFFERED;
+    style |= DWT.DOUBLE_BUFFERED;
 }
 
 void checkBackground () {
@@ -390,8 +390,8 @@
     Composite composite = parent;
     do {
         int mode = composite.backgroundMode;
-        if (mode !is SWT.INHERIT_NONE) {
-            if (mode is SWT.INHERIT_DEFAULT) {
+        if (mode !is DWT.INHERIT_NONE) {
+            if (mode is DWT.INHERIT_DEFAULT) {
                 Control control = this;
                 do {
                     if ((control.state & THEME_BACKGROUND) is 0) {
@@ -409,7 +409,7 @@
 }
 
 void checkBorder () {
-    if (getBorderWidth () is 0) style &= ~SWT.BORDER;
+    if (getBorderWidth () is 0) style &= ~DWT.BORDER;
 }
 
 GtkStyle* childStyle () {
@@ -438,7 +438,7 @@
  * 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.
+ * dimension, the constant <code>DWT.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
@@ -447,12 +447,12 @@
  * 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 wHint the width hint (can be <code>DWT.DEFAULT</code>)
+ * @param hHint the height hint (can be <code>DWT.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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -466,27 +466,27 @@
  */
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     return computeNativeSize (handle, wHint, hHint, changed);
 }
 
 Point computeNativeSize (GtkWidget* h, int wHint, int hHint, bool changed) {
     int width = wHint, height = hHint;
-    if (wHint is SWT.DEFAULT && hHint is SWT.DEFAULT) {
+    if (wHint is DWT.DEFAULT && hHint is DWT.DEFAULT) {
         GtkRequisition requisition;
         gtk_widget_size_request (h, &requisition);
         width = OS.GTK_WIDGET_REQUISITION_WIDTH (h);
         height = OS.GTK_WIDGET_REQUISITION_HEIGHT (h);
-    } else if (wHint is SWT.DEFAULT || hHint is SWT.DEFAULT) {
+    } else if (wHint is DWT.DEFAULT || hHint is DWT.DEFAULT) {
         int reqWidth, reqHeight;
         OS.gtk_widget_get_size_request (h, &reqWidth, &reqHeight);
         OS.gtk_widget_set_size_request (h, wHint, hHint);
         GtkRequisition requisition;
         gtk_widget_size_request (h, &requisition);
         OS.gtk_widget_set_size_request (h, reqWidth, reqHeight);
-        width = wHint is SWT.DEFAULT ? requisition.width : wHint;
-        height = hHint is SWT.DEFAULT ? requisition.height : hHint;
+        width = wHint is DWT.DEFAULT ? requisition.width : wHint;
+        height = hHint is DWT.DEFAULT ? requisition.height : hHint;
     }
     return new Point (width, height);
 }
@@ -515,7 +515,7 @@
  *
  * @return the accessible object
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -541,7 +541,7 @@
  *
  * @return the receiver's bounding rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -569,14 +569,14 @@
  *
  * @param rect the new bounds for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (rect is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (rect is null) error (DWT.ERROR_NULL_ARGUMENT);
     setBounds (rect.x, rect.y, Math.max (0, rect.width), Math.max (0, rect.height), true, true);
 }
 
@@ -598,7 +598,7 @@
  * @param width the new width for the receiver
  * @param height the new height for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -620,7 +620,7 @@
     * the whole parent to redraw.  This is a performance problem. The
     * fix is temporarily make the parent not visible during the move.
     *
-    * NOTE: Because every widget in SWT has an X window, the new and
+    * NOTE: Because every widget in DWT has an X window, the new and
     * old bounds of the child are correctly redrawn.
     */
     int flags = OS.GTK_WIDGET_FLAGS (parentHandle);
@@ -720,11 +720,11 @@
         if (control !is null && control.backgroundImage !is null) {
             if (isVisible ()) redrawWidget (0, 0, 0, 0, true, true, true);
         }
-        sendEvent (SWT.Move);
+        sendEvent (DWT.Move);
         result |= MOVED;
     }
     if (resize && !sameExtent) {
-        sendEvent (SWT.Resize);
+        sendEvent (DWT.Resize);
         result |= RESIZED;
     }
     return result;
@@ -738,7 +738,7 @@
  *
  * @return the receiver's location
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -760,14 +760,14 @@
  *
  * @param location the new location for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (location is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (location is null) error (DWT.ERROR_NULL_ARGUMENT);
     setBounds (location.x, location.y, 0, 0, true, false);
 }
 
@@ -781,7 +781,7 @@
  * @param x the new x coordinate for the receiver
  * @param y the new y coordinate for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -799,7 +799,7 @@
  *
  * @return the receiver's size
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -825,14 +825,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (size is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (size is null) error (DWT.ERROR_NULL_ARGUMENT);
     setBounds (0, 0, Math.max (0, size.x), Math.max (0, size.y), false, true);
 }
 
@@ -870,7 +870,7 @@
  * @param width the new width for the receiver
  * @param height the new height for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -900,7 +900,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -911,7 +911,7 @@
 public void moveAbove (Control control) {
     checkWidget();
     if (control !is null) {
-        if (control.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (control.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
         if (parent !is control.parent) return;
     }
     setZOrder (control, true, true);
@@ -929,7 +929,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -940,7 +940,7 @@
 public void moveBelow (Control control) {
     checkWidget();
     if (control !is null) {
-        if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
+        if (control.isDisposed ()) error(DWT.ERROR_INVALID_ARGUMENT);
         if (parent !is control.parent) return;
     }
     setZOrder (control, false, true);
@@ -951,7 +951,7 @@
  * For a composite, this involves computing the preferred size
  * from its layout, if there is one.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -976,7 +976,7 @@
  *
  * @param changed whether or not the receiver's contents have changed
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -984,7 +984,7 @@
  * @see #computeSize(int, int, bool)
  */
 public void pack (bool changed) {
-    setSize (computeSize (SWT.DEFAULT, SWT.DEFAULT, changed));
+    setSize (computeSize (DWT.DEFAULT, DWT.DEFAULT, changed));
 }
 
 /**
@@ -992,7 +992,7 @@
  *
  * @param layoutData the new layout data for the receiver.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1011,7 +1011,7 @@
  * @param y the y coordinate to be translated
  * @return the translated coordinates
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1037,14 +1037,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (point is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
     return toControl (point.x, point.y);
 }
 
@@ -1057,7 +1057,7 @@
  * @param y the y coordinate to be translated
  * @return the translated coordinates
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1083,14 +1083,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (point is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
     return toDisplay (point.x, point.y);
 }
 
@@ -1105,7 +1105,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1115,10 +1115,10 @@
  */
 public void addControlListener(ControlListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Resize,typedListener);
-    addListener (SWT.Move,typedListener);
+    addListener (DWT.Resize,typedListener);
+    addListener (DWT.Move,typedListener);
 }
 
 /**
@@ -1132,7 +1132,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1144,9 +1144,9 @@
  */
 public void addDragDetectListener (DragDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.DragDetect,typedListener);
+    addListener (DWT.DragDetect,typedListener);
 }
 
 /**
@@ -1160,7 +1160,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1170,10 +1170,10 @@
  */
 public void addFocusListener(FocusListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener(SWT.FocusIn,typedListener);
-    addListener(SWT.FocusOut,typedListener);
+    addListener(DWT.FocusIn,typedListener);
+    addListener(DWT.FocusOut,typedListener);
 }
 
 /**
@@ -1187,7 +1187,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1197,9 +1197,9 @@
  */
 public void addHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Help, typedListener);
+    addListener (DWT.Help, typedListener);
 }
 
 /**
@@ -1224,7 +1224,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1234,10 +1234,10 @@
  */
 public void addKeyListener(KeyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener(SWT.KeyUp,typedListener);
-    addListener(SWT.KeyDown,typedListener);
+    addListener(DWT.KeyUp,typedListener);
+    addListener(DWT.KeyDown,typedListener);
 }
 
 /**
@@ -1251,7 +1251,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1263,9 +1263,9 @@
  */
 public void addMenuDetectListener (MenuDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.MenuDetect, typedListener);
+    addListener (DWT.MenuDetect, typedListener);
 }
 
 /**
@@ -1279,7 +1279,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1289,11 +1289,11 @@
  */
 public void addMouseListener(MouseListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener(SWT.MouseDown,typedListener);
-    addListener(SWT.MouseUp,typedListener);
-    addListener(SWT.MouseDoubleClick,typedListener);
+    addListener(DWT.MouseDown,typedListener);
+    addListener(DWT.MouseUp,typedListener);
+    addListener(DWT.MouseDoubleClick,typedListener);
 }
 
 /**
@@ -1307,7 +1307,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1317,9 +1317,9 @@
  */
 public void addMouseMoveListener(MouseMoveListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener(SWT.MouseMove,typedListener);
+    addListener(DWT.MouseMove,typedListener);
 }
 
 /**
@@ -1333,7 +1333,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1343,11 +1343,11 @@
  */
 public void addMouseTrackListener (MouseTrackListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.MouseEnter,typedListener);
-    addListener (SWT.MouseExit,typedListener);
-    addListener (SWT.MouseHover,typedListener);
+    addListener (DWT.MouseEnter,typedListener);
+    addListener (DWT.MouseExit,typedListener);
+    addListener (DWT.MouseHover,typedListener);
 }
 
 /**
@@ -1361,7 +1361,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1373,9 +1373,9 @@
  */
 public void addMouseWheelListener (MouseWheelListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.MouseWheel, typedListener);
+    addListener (DWT.MouseWheel, typedListener);
 }
 
 /**
@@ -1389,7 +1389,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1399,9 +1399,9 @@
  */
 public void addPaintListener(PaintListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener(SWT.Paint,typedListener);
+    addListener(DWT.Paint,typedListener);
 }
 
 void addRelation (Control control) {
@@ -1418,7 +1418,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1428,9 +1428,9 @@
  */
 public void addTraverseListener (TraverseListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Traverse,typedListener);
+    addListener (DWT.Traverse,typedListener);
 }
 
 /**
@@ -1442,7 +1442,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1452,10 +1452,10 @@
  */
 public void removeControlListener (ControlListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Move, listener);
-    eventTable.unhook (SWT.Resize, listener);
+    eventTable.unhook (DWT.Move, listener);
+    eventTable.unhook (DWT.Resize, listener);
 }
 
 /**
@@ -1467,7 +1467,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1479,9 +1479,9 @@
  */
 public void removeDragDetectListener(DragDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.DragDetect, listener);
+    eventTable.unhook (DWT.DragDetect, listener);
 }
 
 /**
@@ -1493,7 +1493,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1503,10 +1503,10 @@
  */
 public void removeFocusListener(FocusListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.FocusIn, listener);
-    eventTable.unhook (SWT.FocusOut, listener);
+    eventTable.unhook (DWT.FocusIn, listener);
+    eventTable.unhook (DWT.FocusOut, listener);
 }
 /**
  * Removes the listener from the collection of listeners who will
@@ -1517,7 +1517,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1527,9 +1527,9 @@
  */
 public void removeHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Help, listener);
+    eventTable.unhook (DWT.Help, listener);
 }
 /**
  * Removes the listener from the collection of listeners who will
@@ -1540,7 +1540,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1550,10 +1550,10 @@
  */
 public void removeKeyListener(KeyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.KeyUp, listener);
-    eventTable.unhook (SWT.KeyDown, listener);
+    eventTable.unhook (DWT.KeyUp, listener);
+    eventTable.unhook (DWT.KeyDown, listener);
 }
 /**
  * Removes the listener from the collection of listeners who will
@@ -1565,7 +1565,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1577,9 +1577,9 @@
  */
 public void removeMenuDetectListener (MenuDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MenuDetect, listener);
+    eventTable.unhook (DWT.MenuDetect, listener);
 }
 /**
  * Removes the listener from the collection of listeners who will
@@ -1590,7 +1590,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1600,11 +1600,11 @@
  */
 public void removeMouseListener (MouseListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MouseDown, listener);
-    eventTable.unhook (SWT.MouseUp, listener);
-    eventTable.unhook (SWT.MouseDoubleClick, listener);
+    eventTable.unhook (DWT.MouseDown, listener);
+    eventTable.unhook (DWT.MouseUp, listener);
+    eventTable.unhook (DWT.MouseDoubleClick, listener);
 }
 /**
  * Removes the listener from the collection of listeners who will
@@ -1615,7 +1615,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1625,9 +1625,9 @@
  */
 public void removeMouseMoveListener(MouseMoveListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MouseMove, listener);
+    eventTable.unhook (DWT.MouseMove, listener);
 }
 
 /**
@@ -1639,7 +1639,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1649,11 +1649,11 @@
  */
 public void removeMouseTrackListener(MouseTrackListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MouseEnter, listener);
-    eventTable.unhook (SWT.MouseExit, listener);
-    eventTable.unhook (SWT.MouseHover, listener);
+    eventTable.unhook (DWT.MouseEnter, listener);
+    eventTable.unhook (DWT.MouseExit, listener);
+    eventTable.unhook (DWT.MouseHover, listener);
 }
 
 /**
@@ -1665,7 +1665,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1677,9 +1677,9 @@
  */
 public void removeMouseWheelListener (MouseWheelListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MouseWheel, listener);
+    eventTable.unhook (DWT.MouseWheel, listener);
 }
 
 /**
@@ -1691,7 +1691,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1701,9 +1701,9 @@
  */
 public void removePaintListener(PaintListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook(SWT.Paint, listener);
+    eventTable.unhook(DWT.Paint, listener);
 }
 
 /*
@@ -1731,7 +1731,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1741,9 +1741,9 @@
  */
 public void removeTraverseListener(TraverseListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Traverse, listener);
+    eventTable.unhook (DWT.Traverse, listener);
 }
 
 /**
@@ -1769,7 +1769,7 @@
  * @exception IllegalArgumentException <ul>
  *   <li>ERROR_NULL_ARGUMENT when the event is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1784,7 +1784,7 @@
  */
 public bool dragDetect (Event event) {
     checkWidget ();
-    if (event is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (event is null) error (DWT.ERROR_NULL_ARGUMENT);
     return dragDetect (event.button, event.count, event.stateMask, event.x, event.y);
 }
 
@@ -1811,7 +1811,7 @@
  * @exception IllegalArgumentException <ul>
  *   <li>ERROR_NULL_ARGUMENT when the event is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1826,7 +1826,7 @@
  */
 public bool dragDetect (MouseEvent event) {
     checkWidget ();
-    if (event is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (event is null) error (DWT.ERROR_NULL_ARGUMENT);
     return dragDetect (event.button, event.count, event.stateMask, event.x, event.y);
 }
 
@@ -1934,7 +1934,7 @@
  *
  * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1943,7 +1943,7 @@
  */
 public bool forceFocus () {
     checkWidget();
-    if (display.focusEvent is SWT.FocusOut) return false;
+    if (display.focusEvent is DWT.FocusOut) return false;
     Shell shell = getShell ();
     shell.setSavedFocus (this);
     if (!isEnabled () || !isVisible ()) return false;
@@ -1974,7 +1974,7 @@
  *
  * @return the background color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1995,7 +1995,7 @@
  *
  * @return the background image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2030,7 +2030,7 @@
  *
  * @return the border width
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2047,7 +2047,7 @@
  * is changed to match the control's cursor.
  * </p>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2065,7 +2065,7 @@
  *
  * @return the receiver's drag detect state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2085,7 +2085,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2102,7 +2102,7 @@
  *
  * @return the receiver's font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2124,7 +2124,7 @@
  *
  * @return the receiver's foreground color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2163,7 +2163,7 @@
  *
  * @return the receiver's layout data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2183,7 +2183,7 @@
  *
  * @return the receiver's menu
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2240,7 +2240,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2275,7 +2275,7 @@
  *
  * @return the receiver's shell
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2297,7 +2297,7 @@
  *
  * @return the receiver's tool tip text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2318,7 +2318,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2331,13 +2331,13 @@
 override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* gdkEvent) {
     if (gdkEvent.type is OS.GDK_3BUTTON_PRESS) return 0;
     /*
-    * When a shell is created with SWT.ON_TOP and SWT.NO_FOCUS,
+    * When a shell is created with DWT.ON_TOP and DWT.NO_FOCUS,
     * do not activate the shell when the user clicks on the
     * the client area or on the border or a control within the
     * shell that does not take focus.
     */
     Shell shell = _getShell ();
-    if (((shell.style & SWT.ON_TOP) !is 0) && (((shell.style & SWT.NO_FOCUS) is 0) || ((style & SWT.NO_FOCUS) is 0))) {
+    if (((shell.style & DWT.ON_TOP) !is 0) && (((shell.style & DWT.NO_FOCUS) is 0) || ((style & DWT.NO_FOCUS) is 0))) {
         shell.forceActive();
     }
     int /*long*/ result = 0;
@@ -2351,7 +2351,7 @@
             OS.gdk_event_free (nextEvent);
         }
         bool dragging = false;
-        if ((state & DRAG_DETECT) !is 0 && hooks (SWT.DragDetect)) {
+        if ((state & DRAG_DETECT) !is 0 && hooks (DWT.DragDetect)) {
             if (gdkEvent.button is 1) {
                 bool consume = false;
                 if (dragDetect (cast(int) gdkEvent.x, cast(int) gdkEvent.y, true, &consume)) {
@@ -2361,7 +2361,7 @@
                 if (isDisposed ()) return 1;
             }
         }
-        if (!sendMouseEvent (SWT.MouseDown, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state)) {
+        if (!sendMouseEvent (DWT.MouseDown, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state)) {
             result = 1;
         }
         if (isDisposed ()) return 1;
@@ -2383,7 +2383,7 @@
         }
     } else {
         display.clickCount = 2;
-        result = sendMouseEvent (SWT.MouseDoubleClick, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+        result = sendMouseEvent (DWT.MouseDoubleClick, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         if (isDisposed ()) return 1;
     }
     if (!shell.isDisposed ()) shell.setActiveControl (this);
@@ -2394,9 +2394,9 @@
     /*
     * Feature in GTK.  When button 4, 5, 6, or 7 is released, GTK
     * does not deliver a corresponding GTK event.  Button 6 and 7
-    * are mapped to buttons 4 and 5 in SWT.  The fix is to change
+    * are mapped to buttons 4 and 5 in DWT.  The fix is to change
     * the button number of the event to a negative number so that
-    * it gets dispatched by GTK.  SWT has been modified to look
+    * it gets dispatched by GTK.  DWT has been modified to look
     * for negative button numbers.
     */
     int button = gdkEvent.button;
@@ -2405,13 +2405,13 @@
         case -7: button = 5; break;
         default:
     }
-    return sendMouseEvent (SWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+    return sendMouseEvent (DWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
 }
 
 override int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
     char [] chars = fromUtf8z( text );
     if (chars.length is 0) return 0;
-    sendIMKeyEvent (SWT.KeyDown, null, chars);
+    sendIMKeyEvent (DWT.KeyDown, null, chars);
     return 0;
 }
 
@@ -2421,11 +2421,11 @@
     if ((gdkEvent.state & (OS.GDK_BUTTON1_MASK | OS.GDK_BUTTON2_MASK | OS.GDK_BUTTON3_MASK)) !is 0) return 0;
     if (display.currentControl !is null && !display.currentControl.isDisposed ()) {
         display.removeMouseHoverTimeout (display.currentControl.handle);
-        display.currentControl.sendMouseEvent (SWT.MouseExit,  0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state);
+        display.currentControl.sendMouseEvent (DWT.MouseExit,  0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state);
     }
     if (!isDisposed ()) {
         display.currentControl = this;
-        return sendMouseEvent (SWT.MouseEnter, 0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+        return sendMouseEvent (DWT.MouseEnter, 0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
     }
     return 0;
 }
@@ -2475,7 +2475,7 @@
                 }
             }
 
-            sendFocusEvent (gdkEventFocus.in_ !is 0 ? SWT.FocusIn : SWT.FocusOut);
+            sendFocusEvent (gdkEventFocus.in_ !is 0 ? DWT.FocusIn : DWT.FocusOut);
             break;
         default:
         }
@@ -2485,7 +2485,7 @@
 
 override int /*long*/ gtk_expose_event (GtkWidget*  widget, GdkEventExpose* gdkEvent) {
     if ((state & OBSCURED) !is 0) return 0;
-    if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
+    if (!hooks (DWT.Paint) && !filters (DWT.Paint)) return 0;
     Event event = new Event ();
     event.count = gdkEvent.count;
     event.x = gdkEvent.area.x;
@@ -2496,7 +2496,7 @@
     data.damageRgn = gdkEvent.region;
     GC gc = event.gc = GC.gtk_new (this, data);
     OS.gdk_gc_set_clip_region (gc.handle, gdkEvent.region);
-    sendEvent (SWT.Paint, event);
+    sendEvent (DWT.Paint, event);
     gc.dispose ();
     event.gc = null;
     return 0;
@@ -2517,7 +2517,7 @@
                 if (oldIMHandle !is null) OS.gtk_im_context_reset (oldIMHandle);
             }
         }
-        if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
+        if (hooks (DWT.KeyDown) || hooks (DWT.KeyUp)) {
             auto imHandle = imHandle ();
             if (imHandle !is null) OS.gtk_im_context_focus_in (imHandle);
         }
@@ -2528,7 +2528,7 @@
 override int /*long*/ gtk_focus_out_event (GtkWidget* widget, GdkEventFocus* event) {
     // widget could be disposed at this point
     if (handle !is null) {
-        if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
+        if (hooks (DWT.KeyDown) || hooks (DWT.KeyUp)) {
             auto imHandle = imHandle ();
             if (imHandle !is null) {
                 OS.gtk_im_context_focus_out (imHandle);
@@ -2571,7 +2571,7 @@
     if (sendLeaveNotify () || display.getCursorControl () is null) {
         if (gdkEvent.mode !is OS.GDK_CROSSING_NORMAL && gdkEvent.mode !is OS.GDK_CROSSING_UNGRAB) return 0;
         if ((gdkEvent.state & (OS.GDK_BUTTON1_MASK | OS.GDK_BUTTON2_MASK | OS.GDK_BUTTON3_MASK)) !is 0) return 0;
-        result = sendMouseEvent (SWT.MouseExit, 0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+        result = sendMouseEvent (DWT.MouseExit, 0, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         display.currentControl = null;
     }
     return result;
@@ -2598,7 +2598,7 @@
 }
 
 override int /*long*/ gtk_motion_notify_event (GtkWidget* widget, GdkEventMotion* gdkEvent) {
-    if (this is display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
+    if (this is display.currentControl && (hooks (DWT.MouseHover) || filters (DWT.MouseHover))) {
         display.addMouseHoverTimeout (handle);
     }
     double x = gdkEvent.x_root, y = gdkEvent.y_root;
@@ -2612,7 +2612,7 @@
         y = pointer_y;
         state = mask;
     }
-    int result = sendMouseEvent (SWT.MouseMove, 0, gdkEvent.time, x, y, gdkEvent.is_hint !is 0, state) ? 0 : 1;
+    int result = sendMouseEvent (DWT.MouseMove, 0, gdkEvent.time, x, y, gdkEvent.is_hint !is 0, state) ? 0 : 1;
     return result;
 }
 
@@ -2644,13 +2644,13 @@
 override int /*long*/ gtk_scroll_event (GtkWidget* widget, GdkEventScroll* gdkEvent) {
     switch (cast(int)gdkEvent.direction) {
         case OS.GDK_SCROLL_UP:
-            return sendMouseEvent (SWT.MouseWheel, 0, 3, SWT.SCROLL_LINE, true, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+            return sendMouseEvent (DWT.MouseWheel, 0, 3, DWT.SCROLL_LINE, true, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         case OS.GDK_SCROLL_DOWN:
-            return sendMouseEvent (SWT.MouseWheel, 0, -3, SWT.SCROLL_LINE, true, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+            return sendMouseEvent (DWT.MouseWheel, 0, -3, DWT.SCROLL_LINE, true, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         case OS.GDK_SCROLL_LEFT:
-            return sendMouseEvent (SWT.MouseDown, 4, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+            return sendMouseEvent (DWT.MouseDown, 4, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         case OS.GDK_SCROLL_RIGHT:
-            return sendMouseEvent (SWT.MouseDown, 5, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
+            return sendMouseEvent (DWT.MouseDown, 5, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
         default:
     }
     return 0;
@@ -2704,7 +2704,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -2715,13 +2715,13 @@
 public GdkGC* internal_new_GC (GCData data) {
     checkWidget ();
     auto window = paintWindow ();
-    if (window is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (window is null) DWT.error (DWT.ERROR_NO_HANDLES);
     auto gdkGC = OS.gdk_gc_new (cast(GdkDrawable*)window);
-    if (gdkGC is null) error (SWT.ERROR_NO_HANDLES);
+    if (gdkGC is null) error (DWT.ERROR_NO_HANDLES);
     if (data !is null) {
-        int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
+        int mask = DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
         if ((data.style & mask) is 0) {
-            data.style |= style & (mask | SWT.MIRRORED);
+            data.style |= style & (mask | DWT.MIRRORED);
         }
         data.drawable = cast(GdkDrawable*)window;
         data.device = display;
@@ -2743,7 +2743,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -2762,7 +2762,7 @@
  *
  * @return <code>true</code> if the widget can be reparented, otherwise <code>false</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2795,8 +2795,8 @@
         }
     }
     int code = traversalCode (0, null);
-    if ((code & (SWT.TRAVERSE_ARROW_PREVIOUS | SWT.TRAVERSE_ARROW_NEXT)) !is 0) return false;
-    return (code & (SWT.TRAVERSE_TAB_PREVIOUS | SWT.TRAVERSE_TAB_NEXT)) !is 0;
+    if ((code & (DWT.TRAVERSE_ARROW_PREVIOUS | DWT.TRAVERSE_ARROW_NEXT)) !is 0) return false;
+    return (code & (DWT.TRAVERSE_TAB_PREVIOUS | DWT.TRAVERSE_TAB_NEXT)) !is 0;
 }
 bool isTabItem () {
     Control [] tabList = parent._getTabList ();
@@ -2806,7 +2806,7 @@
         }
     }
     int code = traversalCode (0, null);
-    return (code & (SWT.TRAVERSE_ARROW_PREVIOUS | SWT.TRAVERSE_ARROW_NEXT)) !is 0;
+    return (code & (DWT.TRAVERSE_ARROW_PREVIOUS | DWT.TRAVERSE_ARROW_NEXT)) !is 0;
 }
 
 /**
@@ -2818,7 +2818,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2843,7 +2843,7 @@
  *
  * @return the receiver's focus state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2864,7 +2864,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -2903,18 +2903,18 @@
  * is processed, the control will be completely painted,
  * including the background.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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()
  * @see PaintListener
- * @see SWT#Paint
- * @see SWT#NO_BACKGROUND
- * @see SWT#NO_REDRAW_RESIZE
- * @see SWT#NO_MERGE_PAINTS
- * @see SWT#DOUBLE_BUFFERED
+ * @see DWT#Paint
+ * @see DWT#NO_BACKGROUND
+ * @see DWT#NO_REDRAW_RESIZE
+ * @see DWT#NO_MERGE_PAINTS
+ * @see DWT#DOUBLE_BUFFERED
  */
 public void redraw () {
     checkWidget();
@@ -2944,18 +2944,18 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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()
  * @see PaintListener
- * @see SWT#Paint
- * @see SWT#NO_BACKGROUND
- * @see SWT#NO_REDRAW_RESIZE
- * @see SWT#NO_MERGE_PAINTS
- * @see SWT#DOUBLE_BUFFERED
+ * @see DWT#Paint
+ * @see DWT#NO_BACKGROUND
+ * @see DWT#NO_REDRAW_RESIZE
+ * @see DWT#NO_MERGE_PAINTS
+ * @see DWT#DOUBLE_BUFFERED
  */
 public void redraw (int x, int y, int width, int height, bool all) {
     checkWidget();
@@ -3049,7 +3049,7 @@
     } else {
         setInputState (event, stateMask);
     }
-    postEvent (SWT.DragDetect, event);
+    postEvent (DWT.DragDetect, event);
     if (isDisposed ()) return false;
     return event.doit;
 }
@@ -3061,7 +3061,7 @@
     display.focusEvent = type;
     sendEvent (type);
     display.focusControl = null;
-    display.focusEvent = SWT.None;
+    display.focusEvent = DWT.None;
     /*
     * It is possible that the shell may be
     * disposed at this point.  If this happens
@@ -3070,10 +3070,10 @@
     */
     if (!shell.isDisposed ()) {
         switch (type) {
-            case SWT.FocusIn:
+            case DWT.FocusIn:
                 shell.setActiveControl (this);
                 break;
-            case SWT.FocusOut:
+            case DWT.FocusOut:
                 if (shell !is display.activeShell) {
                     shell.setActiveControl (null);
                 }
@@ -3086,8 +3086,8 @@
 bool sendHelpEvent (int /*long*/ helpType) {
     Control control = this;
     while (control !is null) {
-        if (control.hooks (SWT.Help)) {
-            control.postEvent (SWT.Help);
+        if (control.hooks (DWT.Help)) {
+            control.postEvent (DWT.Help);
             return true;
         }
         control = control.parent;
@@ -3152,7 +3152,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3162,7 +3162,7 @@
     if (((state & BACKGROUND) is 0) && color is null) return;
     GdkColor* gdkColor = null;
     if (color !is null) {
-        if (color.isDisposed ()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        if (color.isDisposed ()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         gdkColor = color.handle;
     }
     bool set = false;
@@ -3220,7 +3220,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument is not a bitmap</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3229,7 +3229,7 @@
  */
 public void setBackgroundImage (Image image) {
     checkWidget ();
-    if (image !is null && image.isDisposed ()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+    if (image !is null && image.isDisposed ()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     if (image is backgroundImage) return;
     this.backgroundImage = image;
     if (backgroundImage !is null) {
@@ -3253,7 +3253,7 @@
  *
  * @param capture <code>true</code> to capture the mouse, and <code>false</code> to release it
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3283,14 +3283,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (cursor !is null && cursor.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (cursor !is null && cursor.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
     this.cursor = cursor;
     setCursor (cursor !is null ? cursor.handle : null);
 }
@@ -3315,7 +3315,7 @@
  *
  * @param dragDetect the new drag detect state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3339,7 +3339,7 @@
  *
  * @param enabled the new enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3350,7 +3350,7 @@
     Control control = null;
     bool fixFocus_ = false;
     if (!enabled) {
-        if (display.focusEvent !is SWT.FocusOut) {
+        if (display.focusEvent !is DWT.FocusOut) {
             control = display.getFocusControl ();
             fixFocus_ = isFocusAncestor (control);
         }
@@ -3411,7 +3411,7 @@
  *
  * @return <code>true</code> if the control got focus, and <code>false</code> if it was unable to.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3420,7 +3420,7 @@
  */
 public bool setFocus () {
     checkWidget();
-    if ((style & SWT.NO_FOCUS) !is 0) return false;
+    if ((style & DWT.NO_FOCUS) !is 0) return false;
     return forceFocus ();
 }
 
@@ -3434,7 +3434,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3447,7 +3447,7 @@
     if (font is null) {
         fontDesc = defaultFont ();
     } else {
-        if (font.isDisposed ()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        if (font.isDisposed ()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         fontDesc = font.handle;
     }
     if (font is null) {
@@ -3474,7 +3474,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3484,7 +3484,7 @@
     if (((state & FOREGROUND) is 0) && color is null) return;
     GdkColor* gdkColor = null;
     if (color !is null) {
-        if (color.isDisposed ()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+        if (color.isDisposed ()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
         gdkColor = color.handle;
     }
     bool set = false;
@@ -3516,7 +3516,7 @@
         * Feature in GTK.  On creation, each widget's allocation is
         * initialized to a position of (-1, -1) until the widget is
         * first sized.  The fix is to set the value to (0, 0) as
-        * expected by SWT.
+        * expected by DWT.
         */
         auto topHandle = topHandle ();
         OS.GTK_WIDGET_SET_X (topHandle, 0);
@@ -3547,7 +3547,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3555,18 +3555,18 @@
 public void setMenu (Menu menu) {
     checkWidget();
     if (menu !is null) {
-        if ((menu.style & SWT.POP_UP) is 0) {
-            error (SWT.ERROR_MENU_NOT_POP_UP);
+        if ((menu.style & DWT.POP_UP) is 0) {
+            error (DWT.ERROR_MENU_NOT_POP_UP);
         }
         if (menu.parent !is menuShell ()) {
-            error (SWT.ERROR_INVALID_PARENT);
+            error (DWT.ERROR_INVALID_PARENT);
         }
     }
     this.menu = menu;
 }
 
 override void setOrientation () {
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (handle !is null) OS.gtk_widget_set_direction (handle, OS.GTK_TEXT_DIR_RTL);
         if (fixedHandle !is null) OS.gtk_widget_set_direction (fixedHandle, OS.GTK_TEXT_DIR_RTL);
     }
@@ -3584,15 +3584,15 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is <code>null</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool setParent (Composite parent) {
     checkWidget ();
-    if (parent is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-    if (parent.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+    if (parent is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
+    if (parent.isDisposed()) DWT.error (DWT.ERROR_INVALID_ARGUMENT);
     if (this.parent is parent) return true;
     if (!isReparentable ()) return false;
     releaseParent ();
@@ -3642,7 +3642,7 @@
  *
  * @param redraw the new redraw state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3703,7 +3703,7 @@
  *
  * @param str the new tool tip text (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3729,7 +3729,7 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -3744,7 +3744,7 @@
         * code could have disposed the widget in the show
         * event.  If this happens, just return.
         */
-        sendEvent (SWT.Show);
+        sendEvent (DWT.Show);
         if (isDisposed ()) return;
         state &= ~HIDDEN;
         if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) is 0) {
@@ -3763,7 +3763,7 @@
         */
         Control control = null;
         bool fixFocus_ = false;
-        if (display.focusEvent !is SWT.FocusOut) {
+        if (display.focusEvent !is DWT.FocusOut) {
             control = display.getFocusControl ();
             fixFocus_ = isFocusAncestor (control);
         }
@@ -3777,7 +3777,7 @@
         OS.gtk_widget_hide (topHandle);
         if (isDisposed ()) return;
         if (enableWindow !is null) OS.gdk_window_hide (enableWindow);
-        sendEvent (SWT.Hide);
+        sendEvent (DWT.Hide);
     }
 }
 
@@ -3924,10 +3924,10 @@
     Event event = new Event ();
     event.x = x;
     event.y = y;
-    sendEvent (SWT.MenuDetect, event);
+    sendEvent (DWT.MenuDetect, event);
     if (event.doit) {
         if (menu !is null && !menu.isDisposed ()) {
-            bool hooksKeys = hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
+            bool hooksKeys = hooks (DWT.KeyDown) || hooks (DWT.KeyUp);
             menu.createIMMenu (hooksKeys ? imHandle() : null);
             if (event.x !is x || event.y !is y) {
                 menu.setLocation (event.x, event.y);
@@ -3972,14 +3972,14 @@
 /**
  * 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>.
+ * <code>DWT.TRAVERSE_ESCAPE</code>, <code>DWT.TRAVERSE_RETURN</code>,
+ * <code>DWT.TRAVERSE_TAB_NEXT</code>, <code>DWT.TRAVERSE_TAB_PREVIOUS</code>,
+ * <code>DWT.TRAVERSE_ARROW_NEXT</code> and <code>DWT.TRAVERSE_ARROW_PREVIOUS</code>.
  *
  * @param traversal the type of traversal
  * @return true if the traversal succeeded
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -4004,7 +4004,7 @@
     if (key < 0x20) return false;
     if (gdkEvent.state is 0) {
         int code = traversalCode (keyval, gdkEvent);
-        if ((code & SWT.TRAVERSE_MNEMONIC) is 0) return false;
+        if ((code & DWT.TRAVERSE_MNEMONIC) is 0) return false;
     } else {
         Shell shell = _getShell ();
         int mask = OS.GDK_CONTROL_MASK | OS.GDK_SHIFT_MASK | OS.GDK_MOD1_MASK;
@@ -4013,7 +4013,7 @@
     Decorations shell = menuShell ();
     if (shell.isVisible () && shell.isEnabled ()) {
         Event event = new Event ();
-        event.detail = SWT.TRAVERSE_MNEMONIC;
+        event.detail = DWT.TRAVERSE_MNEMONIC;
         if (setKeyState (event, gdkEvent)) {
             return translateMnemonic (event, null) || shell.translateMnemonic (event, this);
         }
@@ -4022,26 +4022,26 @@
 }
 
 bool translateTraversal (GdkEventKey* keyEvent) {
-    int detail = SWT.TRAVERSE_NONE;
+    int detail = DWT.TRAVERSE_NONE;
     int key = keyEvent.keyval;
     int code = traversalCode (key, keyEvent);
     bool all = false;
     switch (key) {
         case OS.GDK_Escape: {
             all = true;
-            detail = SWT.TRAVERSE_ESCAPE;
+            detail = DWT.TRAVERSE_ESCAPE;
             break;
         }
         case OS.GDK_KP_Enter:
         case OS.GDK_Return: {
             all = true;
-            detail = SWT.TRAVERSE_RETURN;
+            detail = DWT.TRAVERSE_RETURN;
             break;
         }
         case OS.GDK_ISO_Left_Tab:
         case OS.GDK_Tab: {
             bool next = (keyEvent.state & OS.GDK_SHIFT_MASK) is 0;
-            detail = next ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
+            detail = next ? DWT.TRAVERSE_TAB_NEXT : DWT.TRAVERSE_TAB_PREVIOUS;
             break;
         }
         case OS.GDK_Up:
@@ -4049,14 +4049,14 @@
         case OS.GDK_Down:
         case OS.GDK_Right: {
             bool next = key is OS.GDK_Down || key is OS.GDK_Right;
-            detail = next ? SWT.TRAVERSE_ARROW_NEXT : SWT.TRAVERSE_ARROW_PREVIOUS;
+            detail = next ? DWT.TRAVERSE_ARROW_NEXT : DWT.TRAVERSE_ARROW_PREVIOUS;
             break;
         }
         case OS.GDK_Page_Up:
         case OS.GDK_Page_Down: {
             all = true;
             if ((keyEvent.state & OS.GDK_CONTROL_MASK) is 0) return false;
-            detail = key is OS.GDK_Page_Down ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS;
+            detail = key is OS.GDK_Page_Down ? DWT.TRAVERSE_PAGE_NEXT : DWT.TRAVERSE_PAGE_PREVIOUS;
             break;
         }
         default:
@@ -4071,7 +4071,7 @@
     Control control = this;
     do {
         if (control.traverse (event)) return true;
-        if (!event.doit && control.hooks (SWT.Traverse)) return false;
+        if (!event.doit && control.hooks (DWT.Traverse)) return false;
         if (control is shell) return false;
         control = control.parent;
     } while (all && control !is null);
@@ -4079,9 +4079,9 @@
 }
 
 int traversalCode (int key, GdkEventKey* event) {
-    int code = SWT.TRAVERSE_RETURN | SWT.TRAVERSE_TAB_NEXT |  SWT.TRAVERSE_TAB_PREVIOUS | SWT.TRAVERSE_PAGE_NEXT | SWT.TRAVERSE_PAGE_PREVIOUS;
+    int code = DWT.TRAVERSE_RETURN | DWT.TRAVERSE_TAB_NEXT |  DWT.TRAVERSE_TAB_PREVIOUS | DWT.TRAVERSE_PAGE_NEXT | DWT.TRAVERSE_PAGE_PREVIOUS;
     Shell shell = getShell ();
-    if (shell.parent !is null) code |= SWT.TRAVERSE_ESCAPE;
+    if (shell.parent !is null) code |= DWT.TRAVERSE_ESCAPE;
     return code;
 }
 
@@ -4092,20 +4092,20 @@
     * event.  If this happens, return true to stop further
     * event processing.
     */
-    sendEvent (SWT.Traverse, event);
+    sendEvent (DWT.Traverse, event);
     if (isDisposed ()) return true;
     if (!event.doit) return false;
     switch (event.detail) {
-        case SWT.TRAVERSE_NONE:         return true;
-        case SWT.TRAVERSE_ESCAPE:           return traverseEscape ();
-        case SWT.TRAVERSE_RETURN:           return traverseReturn ();
-        case SWT.TRAVERSE_TAB_NEXT:     return traverseGroup (true);
-        case SWT.TRAVERSE_TAB_PREVIOUS: return traverseGroup (false);
-        case SWT.TRAVERSE_ARROW_NEXT:       return traverseItem (true);
-        case SWT.TRAVERSE_ARROW_PREVIOUS:   return traverseItem (false);
-        case SWT.TRAVERSE_MNEMONIC:     return traverseMnemonic (event.character);
-        case SWT.TRAVERSE_PAGE_NEXT:        return traversePage (true);
-        case SWT.TRAVERSE_PAGE_PREVIOUS:    return traversePage (false);
+        case DWT.TRAVERSE_NONE:         return true;
+        case DWT.TRAVERSE_ESCAPE:           return traverseEscape ();
+        case DWT.TRAVERSE_RETURN:           return traverseReturn ();
+        case DWT.TRAVERSE_TAB_NEXT:     return traverseGroup (true);
+        case DWT.TRAVERSE_TAB_PREVIOUS: return traverseGroup (false);
+        case DWT.TRAVERSE_ARROW_NEXT:       return traverseItem (true);
+        case DWT.TRAVERSE_ARROW_PREVIOUS:   return traverseItem (false);
+        case DWT.TRAVERSE_MNEMONIC:     return traverseMnemonic (event.character);
+        case DWT.TRAVERSE_PAGE_NEXT:        return traversePage (true);
+        case DWT.TRAVERSE_PAGE_PREVIOUS:    return traversePage (false);
         default:
     }
     return false;
@@ -4189,7 +4189,7 @@
  * Note: This method does not cause a redraw.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -4197,7 +4197,7 @@
  * @see #redraw()
  * @see #redraw(int, int, int, int, bool)
  * @see PaintListener
- * @see SWT#Paint
+ * @see DWT#Paint
  */
 public void update () {
     checkWidget ();
--- a/dwt/widgets/Decorations.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Decorations.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,7 +14,7 @@
 import dwt.widgets.Menu;
 import dwt.widgets.Composite;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 //import dwt.graphics.;
 import dwt.widgets.Canvas;
@@ -76,7 +76,7 @@
  * <dt><b>Events:</b></dt>
  * <dd>(none)</dd>
  * </dl>
- * Class <code>SWT</code> provides two "convenience constants"
+ * Class <code>DWT</code> provides two "convenience constants"
  * for the most commonly required style combinations:
  * <dl>
  * <dt><code>SHELL_TRIM</code></dt>
@@ -94,13 +94,13 @@
  * </dl>
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  *
  * @see #getMinimized
  * @see #getMaximized
  * @see Shell
- * @see SWT
+ * @see DWT
  */
 public class Decorations : Canvas {
     char[] text;
@@ -123,10 +123,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -137,22 +137,22 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#BORDER
+ * @see DWT#CLOSE
+ * @see DWT#MIN
+ * @see DWT#MAX
+ * @see DWT#RESIZE
+ * @see DWT#TITLE
+ * @see DWT#NO_TRIM
+ * @see DWT#SHELL_TRIM
+ * @see DWT#DIALOG_TRIM
+ * @see DWT#ON_TOP
+ * @see DWT#TOOL
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -161,17 +161,17 @@
 }
 
 static int checkStyle (int style) {
-    if ((style & SWT.NO_TRIM) !is 0) {
-        style &= ~(SWT.CLOSE | SWT.TITLE | SWT.MIN | SWT.MAX | SWT.RESIZE | SWT.BORDER);
+    if ((style & DWT.NO_TRIM) !is 0) {
+        style &= ~(DWT.CLOSE | DWT.TITLE | DWT.MIN | DWT.MAX | DWT.RESIZE | DWT.BORDER);
     }
-    if ((style & (SWT.MENU | SWT.MIN | SWT.MAX | SWT.CLOSE)) !is 0) {
-        style |= SWT.TITLE;
+    if ((style & (DWT.MENU | DWT.MIN | DWT.MAX | DWT.CLOSE)) !is 0) {
+        style |= DWT.TITLE;
     }
     return style;
 }
 
 override protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 void _setImages (Image [] images) {
@@ -218,12 +218,12 @@
     if (data1.width is data2.width && data1.height is data2.height) {
         int transparent1 = data1.getTransparencyType ();
         int transparent2 = data2.getTransparencyType ();
-        if (transparent1 is SWT.TRANSPARENCY_ALPHA) return -1;
-        if (transparent2 is SWT.TRANSPARENCY_ALPHA) return 1;
-        if (transparent1 is SWT.TRANSPARENCY_MASK) return -1;
-        if (transparent2 is SWT.TRANSPARENCY_MASK) return 1;
-        if (transparent1 is SWT.TRANSPARENCY_PIXEL) return -1;
-        if (transparent2 is SWT.TRANSPARENCY_PIXEL) return 1;
+        if (transparent1 is DWT.TRANSPARENCY_ALPHA) return -1;
+        if (transparent2 is DWT.TRANSPARENCY_ALPHA) return 1;
+        if (transparent1 is DWT.TRANSPARENCY_MASK) return -1;
+        if (transparent2 is DWT.TRANSPARENCY_MASK) return 1;
+        if (transparent1 is DWT.TRANSPARENCY_PIXEL) return -1;
+        if (transparent2 is DWT.TRANSPARENCY_PIXEL) return 1;
         return 0;
     }
     return data1.width > data2.width || data1.height > data2.height ? -1 : 1;
@@ -240,7 +240,7 @@
 void createAccelGroup () {
     if (accelGroup !is null) return;
     accelGroup = OS.gtk_accel_group_new ();
-    if (accelGroup is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (accelGroup is null) DWT.error (DWT.ERROR_NO_HANDLES);
     //FIXME - what should we do for Decorations
     auto shellHandle = topHandle ();
     OS.gtk_window_add_accel_group (cast(GtkWindow*)shellHandle, accelGroup);
@@ -293,7 +293,7 @@
  *
  * @return the default button or null
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -321,7 +321,7 @@
  *
  * @return the image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -351,7 +351,7 @@
  *
  * @return the images
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -373,7 +373,7 @@
  *
  * @return the maximized state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -391,7 +391,7 @@
  *
  * @return the menu bar or null
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -408,7 +408,7 @@
  *
  * @return the minimized state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -432,7 +432,7 @@
  *
  * @return the text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -536,7 +536,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the button has been disposed</li>
  *    <li>ERROR_INVALID_PARENT - if the control is not in the same widget tree</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -545,8 +545,8 @@
     checkWidget();
     GtkWidget* buttonHandle;
     if (button !is null) {
-        if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
-        if (button.menuShell () !is this) error (SWT.ERROR_INVALID_PARENT);
+        if (button.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
+        if (button.menuShell () !is this) error (DWT.ERROR_INVALID_PARENT);
         buttonHandle = button.handle;
     }
     saveDefault = defaultButton = button;
@@ -565,7 +565,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -593,7 +593,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the array of images is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if one of the images is null or has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -602,9 +602,9 @@
  */
 public void setImages (Image [] images) {
     checkWidget ();
-    if (images is null) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (images is null) error (DWT.ERROR_INVALID_ARGUMENT);
     for (int i = 0; i < images.length; i++) {
-        if (images [i] is null || images [i].isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (images [i] is null || images [i].isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
     }
     this.images = images;
     _setImages (images);
@@ -626,7 +626,7 @@
  *
  * @param maximized the new maximized state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -648,7 +648,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -657,8 +657,8 @@
     checkWidget();
     if (menuBar is menu) return;
     if (menu !is null) {
-        if ((menu.style & SWT.BAR) is 0) error (SWT.ERROR_MENU_NOT_BAR);
-        if (menu.parent !is this) error (SWT.ERROR_INVALID_PARENT);
+        if ((menu.style & DWT.BAR) is 0) error (DWT.ERROR_MENU_NOT_BAR);
+        if (menu.parent !is this) error (DWT.ERROR_INVALID_PARENT);
     }
     menuBar = menu;
 }
@@ -679,7 +679,7 @@
  *
  * @param minimized the new maximized state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -706,14 +706,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     text = string;
 }
 
--- a/dwt/widgets/Display.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Display.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.widgets.Display;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Color;
 import dwt.graphics.Cursor;
 import dwt.graphics.Device;
@@ -50,21 +50,21 @@
 
 /**
  * Instances of this class are responsible for managing the
- * connection between SWT and the underlying operating
+ * connection between DWT and the underlying operating
  * system. Their most important function is to implement
- * the SWT event loop in terms of the platform event model.
+ * the DWT 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.
+ * the operating system resources which DWT allocates.
  * <p>
- * Applications which are built with SWT will <em>almost always</em>
+ * Applications which are built with DWT 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>
+ * which DWT 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>
+ * In DWT, the thread which creates a <code>Display</code>
  * instance is distinguished as the <em>user-interface thread</em>
  * for that display.
  * </p>
@@ -75,7 +75,7 @@
  * 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
+ * Some DWT 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
@@ -92,7 +92,7 @@
  * even on platforms which support it, is to have multiple threads.)
  * </li>
  * </ul>
- * Enforcing these attributes allows SWT to be implemented directly
+ * Enforcing these attributes allows DWT 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,
@@ -102,10 +102,10 @@
  * 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
+ * All DWT 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.
+ * DWT exception.
  * </p>
  * <dl>
  * <dt><b>Styles:</b></dt>
@@ -141,7 +141,7 @@
 
     CallbackData  filterProcCallbackData;
     EventTable eventTable, filterTable;
-    static char[] APP_NAME = "SWT";
+    static char[] APP_NAME = "DWT";
     static const char[] DISPATCH_EVENT_KEY = "dwt.internal.gtk.dispatchEvent";
     static const char[] ADD_WIDGET_KEY = "dwt.internal.addWidget";
     GClosure*[] closures;
@@ -252,7 +252,7 @@
     Image errorImage, infoImage, questionImage, warningImage;
     Cursor [] cursors;
     Resource [] resources;
-    static const int RESOURCE_SIZE = 1 + 4 + SWT.CURSOR_HAND + 1;
+    static const int RESOURCE_SIZE = 1 + 4 + DWT.CURSOR_HAND + 1;
 
     /* Colors */
     GdkColor* COLOR_WIDGET_DARK_SHADOW, COLOR_WIDGET_NORMAL_SHADOW, COLOR_WIDGET_LIGHT_SHADOW;
@@ -283,91 +283,91 @@
     static const int [] [] KeyTable = [
 
         /* Keyboard and Mouse Masks */
-        [OS.GDK_Alt_L,      SWT.ALT],
-        [OS.GDK_Alt_R,      SWT.ALT],
-        [OS.GDK_Meta_L, SWT.ALT],
-        [OS.GDK_Meta_R, SWT.ALT],
-        [OS.GDK_Shift_L,        SWT.SHIFT],
-        [OS.GDK_Shift_R,        SWT.SHIFT],
-        [OS.GDK_Control_L,  SWT.CONTROL],
-        [OS.GDK_Control_R,  SWT.CONTROL],
-//      [OS.GDK_????,       SWT.COMMAND],
-//      [OS.GDK_????,       SWT.COMMAND],
+        [OS.GDK_Alt_L,      DWT.ALT],
+        [OS.GDK_Alt_R,      DWT.ALT],
+        [OS.GDK_Meta_L, DWT.ALT],
+        [OS.GDK_Meta_R, DWT.ALT],
+        [OS.GDK_Shift_L,        DWT.SHIFT],
+        [OS.GDK_Shift_R,        DWT.SHIFT],
+        [OS.GDK_Control_L,  DWT.CONTROL],
+        [OS.GDK_Control_R,  DWT.CONTROL],
+//      [OS.GDK_????,       DWT.COMMAND],
+//      [OS.GDK_????,       DWT.COMMAND],
 
         /* Non-Numeric Keypad Keys */
-        [OS.GDK_Up,                     SWT.ARROW_UP],
-        [OS.GDK_KP_Up,                  SWT.ARROW_UP],
-        [OS.GDK_Down,                   SWT.ARROW_DOWN],
-        [OS.GDK_KP_Down,            SWT.ARROW_DOWN],
-        [OS.GDK_Left,                       SWT.ARROW_LEFT],
-        [OS.GDK_KP_Left,                SWT.ARROW_LEFT],
-        [OS.GDK_Right,                  SWT.ARROW_RIGHT],
-        [OS.GDK_KP_Right,               SWT.ARROW_RIGHT],
-        [OS.GDK_Page_Up,                SWT.PAGE_UP],
-        [OS.GDK_KP_Page_Up,     SWT.PAGE_UP],
-        [OS.GDK_Page_Down,          SWT.PAGE_DOWN],
-        [OS.GDK_KP_Page_Down,   SWT.PAGE_DOWN],
-        [OS.GDK_Home,                   SWT.HOME],
-        [OS.GDK_KP_Home,            SWT.HOME],
-        [OS.GDK_End,                        SWT.END],
-        [OS.GDK_KP_End,             SWT.END],
-        [OS.GDK_Insert,                 SWT.INSERT],
-        [OS.GDK_KP_Insert,          SWT.INSERT],
+        [OS.GDK_Up,                     DWT.ARROW_UP],
+        [OS.GDK_KP_Up,                  DWT.ARROW_UP],
+        [OS.GDK_Down,                   DWT.ARROW_DOWN],
+        [OS.GDK_KP_Down,            DWT.ARROW_DOWN],
+        [OS.GDK_Left,                       DWT.ARROW_LEFT],
+        [OS.GDK_KP_Left,                DWT.ARROW_LEFT],
+        [OS.GDK_Right,                  DWT.ARROW_RIGHT],
+        [OS.GDK_KP_Right,               DWT.ARROW_RIGHT],
+        [OS.GDK_Page_Up,                DWT.PAGE_UP],
+        [OS.GDK_KP_Page_Up,     DWT.PAGE_UP],
+        [OS.GDK_Page_Down,          DWT.PAGE_DOWN],
+        [OS.GDK_KP_Page_Down,   DWT.PAGE_DOWN],
+        [OS.GDK_Home,                   DWT.HOME],
+        [OS.GDK_KP_Home,            DWT.HOME],
+        [OS.GDK_End,                        DWT.END],
+        [OS.GDK_KP_End,             DWT.END],
+        [OS.GDK_Insert,                 DWT.INSERT],
+        [OS.GDK_KP_Insert,          DWT.INSERT],
 
         /* Virtual and Ascii Keys */
-        [OS.GDK_BackSpace,      SWT.BS],
-        [OS.GDK_Return,             SWT.CR],
-        [OS.GDK_Delete,             SWT.DEL],
-        [OS.GDK_KP_Delete,      SWT.DEL],
-        [OS.GDK_Escape,         SWT.ESC],
-        [OS.GDK_Linefeed,           SWT.LF],
-        [OS.GDK_Tab,                    SWT.TAB],
-        [OS.GDK_ISO_Left_Tab,   SWT.TAB],
+        [OS.GDK_BackSpace,      DWT.BS],
+        [OS.GDK_Return,             DWT.CR],
+        [OS.GDK_Delete,             DWT.DEL],
+        [OS.GDK_KP_Delete,      DWT.DEL],
+        [OS.GDK_Escape,         DWT.ESC],
+        [OS.GDK_Linefeed,           DWT.LF],
+        [OS.GDK_Tab,                    DWT.TAB],
+        [OS.GDK_ISO_Left_Tab,   DWT.TAB],
 
         /* Functions Keys */
-        [OS.GDK_F1,     SWT.F1],
-        [OS.GDK_F2,     SWT.F2],
-        [OS.GDK_F3,     SWT.F3],
-        [OS.GDK_F4,     SWT.F4],
-        [OS.GDK_F5,     SWT.F5],
-        [OS.GDK_F6,     SWT.F6],
-        [OS.GDK_F7,     SWT.F7],
-        [OS.GDK_F8,     SWT.F8],
-        [OS.GDK_F9,     SWT.F9],
-        [OS.GDK_F10,        SWT.F10],
-        [OS.GDK_F11,        SWT.F11],
-        [OS.GDK_F12,        SWT.F12],
-        [OS.GDK_F13,        SWT.F13],
-        [OS.GDK_F14,        SWT.F14],
-        [OS.GDK_F15,        SWT.F15],
+        [OS.GDK_F1,     DWT.F1],
+        [OS.GDK_F2,     DWT.F2],
+        [OS.GDK_F3,     DWT.F3],
+        [OS.GDK_F4,     DWT.F4],
+        [OS.GDK_F5,     DWT.F5],
+        [OS.GDK_F6,     DWT.F6],
+        [OS.GDK_F7,     DWT.F7],
+        [OS.GDK_F8,     DWT.F8],
+        [OS.GDK_F9,     DWT.F9],
+        [OS.GDK_F10,        DWT.F10],
+        [OS.GDK_F11,        DWT.F11],
+        [OS.GDK_F12,        DWT.F12],
+        [OS.GDK_F13,        DWT.F13],
+        [OS.GDK_F14,        DWT.F14],
+        [OS.GDK_F15,        DWT.F15],
 
         /* Numeric Keypad Keys */
-        [OS.GDK_KP_Multiply,        SWT.KEYPAD_MULTIPLY],
-        [OS.GDK_KP_Add,         SWT.KEYPAD_ADD],
-        [OS.GDK_KP_Enter,           SWT.KEYPAD_CR],
-        [OS.GDK_KP_Subtract,    SWT.KEYPAD_SUBTRACT],
-        [OS.GDK_KP_Decimal, SWT.KEYPAD_DECIMAL],
-        [OS.GDK_KP_Divide,      SWT.KEYPAD_DIVIDE],
-        [OS.GDK_KP_0,           SWT.KEYPAD_0],
-        [OS.GDK_KP_1,           SWT.KEYPAD_1],
-        [OS.GDK_KP_2,           SWT.KEYPAD_2],
-        [OS.GDK_KP_3,           SWT.KEYPAD_3],
-        [OS.GDK_KP_4,           SWT.KEYPAD_4],
-        [OS.GDK_KP_5,           SWT.KEYPAD_5],
-        [OS.GDK_KP_6,           SWT.KEYPAD_6],
-        [OS.GDK_KP_7,           SWT.KEYPAD_7],
-        [OS.GDK_KP_8,           SWT.KEYPAD_8],
-        [OS.GDK_KP_9,           SWT.KEYPAD_9],
-        [OS.GDK_KP_Equal,   SWT.KEYPAD_EQUAL],
+        [OS.GDK_KP_Multiply,        DWT.KEYPAD_MULTIPLY],
+        [OS.GDK_KP_Add,         DWT.KEYPAD_ADD],
+        [OS.GDK_KP_Enter,           DWT.KEYPAD_CR],
+        [OS.GDK_KP_Subtract,    DWT.KEYPAD_SUBTRACT],
+        [OS.GDK_KP_Decimal, DWT.KEYPAD_DECIMAL],
+        [OS.GDK_KP_Divide,      DWT.KEYPAD_DIVIDE],
+        [OS.GDK_KP_0,           DWT.KEYPAD_0],
+        [OS.GDK_KP_1,           DWT.KEYPAD_1],
+        [OS.GDK_KP_2,           DWT.KEYPAD_2],
+        [OS.GDK_KP_3,           DWT.KEYPAD_3],
+        [OS.GDK_KP_4,           DWT.KEYPAD_4],
+        [OS.GDK_KP_5,           DWT.KEYPAD_5],
+        [OS.GDK_KP_6,           DWT.KEYPAD_6],
+        [OS.GDK_KP_7,           DWT.KEYPAD_7],
+        [OS.GDK_KP_8,           DWT.KEYPAD_8],
+        [OS.GDK_KP_9,           DWT.KEYPAD_9],
+        [OS.GDK_KP_Equal,   DWT.KEYPAD_EQUAL],
 
         /* Other keys */
-        [OS.GDK_Caps_Lock,      SWT.CAPS_LOCK],
-        [OS.GDK_Num_Lock,       SWT.NUM_LOCK],
-        [OS.GDK_Scroll_Lock,        SWT.SCROLL_LOCK],
-        [OS.GDK_Pause,              SWT.PAUSE],
-        [OS.GDK_Break,              SWT.BREAK],
-        [OS.GDK_Print,                  SWT.PRINT_SCREEN],
-        [OS.GDK_Help,                   SWT.HELP],
+        [OS.GDK_Caps_Lock,      DWT.CAPS_LOCK],
+        [OS.GDK_Num_Lock,       DWT.NUM_LOCK],
+        [OS.GDK_Scroll_Lock,        DWT.SCROLL_LOCK],
+        [OS.GDK_Pause,              DWT.PAUSE],
+        [OS.GDK_Break,              DWT.BREAK],
+        [OS.GDK_Print,                  DWT.PRINT_SCREEN],
+        [OS.GDK_Help,                   DWT.HELP],
 
     ];
 
@@ -453,7 +453,7 @@
  * marked as the <em>default</em> display.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if called from a thread that already created an existing display</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
@@ -479,18 +479,18 @@
     flushRect = new GdkRectangle ();
     exposeEvent = new XExposeEvent ();
     visibilityEvent = new XVisibilityEvent ();
-    cursors = new Cursor [SWT.CURSOR_HAND + 1];
+    cursors = new Cursor [DWT.CURSOR_HAND + 1];
 }
 
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when an event of the given type occurs anywhere
  * in a widget. The event type is one of the event constants
- * defined in class <code>SWT</code>. When the event does occur,
+ * defined in class <code>DWT</code>. When the event does occur,
  * the listener is notified by sending it the <code>handleEvent()</code>
  * message.
  * <p>
- * Setting the type of an event to <code>SWT.None</code> from
+ * Setting the type of an event to <code>DWT.None</code> from
  * within the <code>handleEvent()</code> method can be used to
  * change the event type and stop subsequent Java listeners
  * from running. Because event filters run before other listeners,
@@ -506,13 +506,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see Listener
- * @see SWT
+ * @see DWT
  * @see #removeFilter
  * @see #removeListener
  *
@@ -520,7 +520,7 @@
  */
 public void addFilter (int eventType, Listener listener) {
     checkDevice ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (filterTable is null) filterTable = new EventTable ();
     filterTable.hook (eventType, listener);
 }
@@ -567,7 +567,7 @@
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when an event of the given type occurs. The event
- * type is one of the event constants defined in class <code>SWT</code>.
+ * type is one of the event constants defined in class <code>DWT</code>.
  * When the event does occur in the display, the listener is notified by
  * sending it the <code>handleEvent()</code> message.
  *
@@ -577,20 +577,20 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see Listener
- * @see SWT
+ * @see DWT
  * @see #removeListener
  *
  * @since 2.0
  */
 public void addListener (int eventType, Listener listener) {
     checkDevice ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) eventTable = new EventTable ();
     eventTable.hook (eventType, listener);
 }
@@ -681,14 +681,14 @@
  *
  * @param runnable code to run on the user-interface thread or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #syncExec
  */
 public void asyncExec (Runnable runnable) {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
     synchronized (idleLock) {
         if (idleNeeded && idleHandle is 0) {
             //NOTE: calling unlocked function in OS
@@ -702,13 +702,13 @@
  * Causes the system hardware to emit a short sound
  * (if it supports this capability).
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public void beep () {
-    if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
+    if (!isValidThread ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
     OS.gdk_beep();
     if (!OS.GDK_WINDOWING_X11 ()) {
         OS.gdk_flush ();
@@ -725,16 +725,16 @@
 }
 
 protected void checkDevice () {
-    if (thread is null) error (SWT.ERROR_WIDGET_DISPOSED);
-    if (thread !is Thread.getThis ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (thread is null) error (DWT.ERROR_WIDGET_DISPOSED);
+    if (thread !is Thread.getThis ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
 }
 
 static synchronized void checkDisplay (Thread thread, bool multiple) {
     for (int i=0; i<Displays.length; i++) {
         if (Displays [i] !is null) {
-            if (!multiple) SWT.error (SWT.ERROR_NOT_IMPLEMENTED, null, " [multiple displays]");
-            if (Displays [i].thread is thread) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
+            if (!multiple) DWT.error (DWT.ERROR_NOT_IMPLEMENTED, null, " [multiple displays]");
+            if (Displays [i].thread is thread) DWT.error (DWT.ERROR_THREAD_INVALID_ACCESS);
         }
     }
 }
@@ -808,21 +808,21 @@
  * IMPORTANT: See the comment in <code>Widget.checkSubclass()</code>.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
  *
  * @see Widget#checkSubclass
  */
 protected void checkSubclass () {
-//PORTING_TODO  if (!isValidClass (getClass ())) error (SWT.ERROR_INVALID_SUBCLASS);
+//PORTING_TODO  if (!isValidClass (getClass ())) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 /**
- * Requests that the connection between SWT and the underlying
+ * Requests that the connection between DWT and the underlying
  * operating system be closed.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -834,7 +834,7 @@
 public void close () {
     checkDevice ();
     Event event = new Event ();
-    sendEvent (SWT.Close, event);
+    sendEvent (DWT.Close, event);
     if (event.doit) dispose ();
 }
 
@@ -866,14 +866,14 @@
     OS.gtk_set_locale();
     int cnt = 0;
     if (!OS.gtk_init_check (&cnt, null)) {
-        SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
+        DWT.error (DWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
     }
     if (OS.GDK_WINDOWING_X11 ()) xDisplay = cast(void*) OS.GDK_DISPLAY ();
     char* ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
     if (ptr !is null) {
         char [] buffer = fromUtf8z(ptr);
         Stdout.formatln ("***WARNING: {}", buffer );
-        Stdout.formatln ("***WARNING: SWT requires GTK {}.{}.{}", MAJOR, MINOR, MICRO );
+        Stdout.formatln ("***WARNING: DWT requires GTK {}.{}.{}", MAJOR, MINOR, MICRO );
         int major = OS.gtk_major_version (), minor = OS.gtk_minor_version (), micro = OS.gtk_micro_version ();
         Stdout.formatln ("***WARNING: Detected: {}.{}.{}", major, minor, micro);
     }
@@ -915,7 +915,7 @@
 
     /* Initialize the hidden shell */
     shellHandle = OS.gtk_window_new (OS.GTK_WINDOW_TOPLEVEL);
-    if (shellHandle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (shellHandle is null) DWT.error (DWT.ERROR_NO_HANDLES);
     OS.gtk_widget_realize (shellHandle);
 
     /* Initialize the filter and event callback */
@@ -987,10 +987,10 @@
     bool hasMask = image.mask !is null && OS.gdk_drawable_get_depth (image.mask) is 1;
     if (hasMask) {
         pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w, h );
-        if (pixbuf is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (pixbuf is null) DWT.error (DWT.ERROR_NO_HANDLES);
         OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w, h);
         auto maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w, h);
-        if (maskPixbuf is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (maskPixbuf is null) DWT.error (DWT.ERROR_NO_HANDLES);
         OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, null, 0, 0, 0, 0, w, h);
         int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
         auto pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
@@ -1013,9 +1013,9 @@
         OS.g_object_unref(maskPixbuf);
     } else {
         ImageData data = image.getImageData ();
-        bool hasAlpha = data.getTransparencyType () is SWT.TRANSPARENCY_ALPHA;
+        bool hasAlpha = data.getTransparencyType () is DWT.TRANSPARENCY_ALPHA;
         pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, hasAlpha, 8, w, h);
-        if (pixbuf is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (pixbuf is null) DWT.error (DWT.ERROR_NO_HANDLES);
         OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w, h);
         if (hasAlpha) {
             byte [] alpha = data.alphaData;
@@ -1088,7 +1088,7 @@
  *
  * @param runnable code to run at dispose time.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1110,14 +1110,14 @@
 
 /**
  * Does whatever display specific cleanup is required, and then
- * uses the code in <code>SWTError.error</code> to handle the error.
+ * uses the code in <code>DWTError.error</code> to handle the error.
  *
  * @param code the descriptive error code
  *
- * @see SWTError#error
+ * @see DWTError#error
  */
 void error (int code) {
-    SWT.error (code);
+    DWT.error (code);
 }
 
 private static extern(C) void eventProcFunc (GdkEvent* event, void* data) {
@@ -1201,7 +1201,7 @@
         }
         if (control !is null) {
             shell = control.getShell ();
-            if ((shell.style & SWT.ON_TOP) !is 0) {
+            if ((shell.style & DWT.ON_TOP) !is 0) {
                 OS.gtk_grab_add (shell.shellHandle);
             }
         }
@@ -1209,7 +1209,7 @@
     OS.gtk_main_do_event (event);
     if (dispatchEvents is null) putGdkEvents ();
     if (control !is null) {
-        if (shell !is null && !shell.isDisposed () && (shell.style & SWT.ON_TOP) !is 0) {
+        if (shell !is null && !shell.isDisposed () && (shell.style & DWT.ON_TOP) !is 0) {
             OS.gtk_grab_remove (shell.shellHandle);
         }
     }
@@ -1227,9 +1227,9 @@
  * </p>
  *
  * @param handle the handle for the widget
- * @return the SWT widget that the handle represents
+ * @return the DWT widget that the handle represents
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1252,9 +1252,9 @@
  *
  * @param handle the handle for the widget
  * @param id the id for the subwidget (usually an item)
- * @return the SWT widget that the handle/id pair represents
+ * @return the DWT widget that the handle/id pair represents
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1274,9 +1274,9 @@
  *
  * @param widget the widget
  * @param id the id for the subwidget (usually an item)
- * @return the SWT subwidget (usually an item) that the widget/id pair represents
+ * @return the DWT subwidget (usually an item) that the widget/id pair represents
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1341,7 +1341,7 @@
  *
  * @return the active shell or null
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1356,7 +1356,7 @@
  *
  * @return the bounding rectangle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1406,7 +1406,7 @@
  *
  * @return the control under the cursor
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1453,9 +1453,9 @@
         /*
          * Feature in GTK.  When button 4, 5, 6, or 7 is released, GTK
          * does not deliver a corresponding GTK event.  Button 6 and 7
-         * are mapped to buttons 4 and 5 in SWT.  The fix is to change
+         * are mapped to buttons 4 and 5 in DWT.  The fix is to change
          * the button number of the event to a negative number so that
-         * it gets dispatched by GTK.  SWT has been modified to look
+         * it gets dispatched by GTK.  DWT has been modified to look
          * for negative button numbers.
          */
         XButtonEvent* mouseEvent = cast(XButtonEvent*) xEvent;
@@ -1480,7 +1480,7 @@
  *
  * @return the cursor location
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1497,7 +1497,7 @@
  *
  * @return the array of cursor sizes
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1526,7 +1526,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1536,7 +1536,7 @@
  */
 public Object getData (char[] key) {
     checkDevice ();
-    if (key is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (key ==/*eq*/ DISPATCH_EVENT_KEY) {
         return new ArrayWrapperInt(dispatchEvents);
     }
@@ -1562,7 +1562,7 @@
  *
  * @return the display specific data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1582,7 +1582,7 @@
  *
  * @return the horizontal and vertical DPI
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
@@ -1639,7 +1639,7 @@
  *
  * @return the button dismissal order
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1648,7 +1648,7 @@
  */
 public int getDismissalAlignment () {
     checkDevice ();
-    return SWT.RIGHT;
+    return DWT.RIGHT;
 }
 
 /**
@@ -1658,7 +1658,7 @@
  *
  * @return the double click time
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1679,7 +1679,7 @@
  *
  * @return the control under the cursor
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1713,7 +1713,7 @@
  *
  * @return the high contrast mode
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1737,7 +1737,7 @@
  *
  * @return the maximum icon depth
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1754,7 +1754,7 @@
  *
  * @return the array of icon sizes
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1888,7 +1888,7 @@
  *
  * @return the receiver's shells
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -1932,20 +1932,20 @@
  *
  * @return the receiver's sync-interface thread
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Thread getSyncThread () {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed ()) error (DWT.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
+ * specified in class <code>DWT</code>. Any value other
+ * than one of the DWT 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.
@@ -1953,82 +1953,82 @@
  * @param id the color constant
  * @return the matching color
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
- * @see SWT
+ * @see DWT
  */
 public Color getSystemColor (int id) {
     checkDevice ();
     GdkColor* gdkColor = null;
     switch (id) {
-        case SWT.COLOR_INFO_FOREGROUND:                     gdkColor = COLOR_INFO_FOREGROUND; break;
-        case SWT.COLOR_INFO_BACKGROUND:                     gdkColor = COLOR_INFO_BACKGROUND; break;
-        case SWT.COLOR_TITLE_FOREGROUND:                    gdkColor = COLOR_TITLE_FOREGROUND; break;
-        case SWT.COLOR_TITLE_BACKGROUND:                    gdkColor = COLOR_TITLE_BACKGROUND; break;
-        case SWT.COLOR_TITLE_BACKGROUND_GRADIENT:           gdkColor = COLOR_TITLE_BACKGROUND_GRADIENT; break;
-        case SWT.COLOR_TITLE_INACTIVE_FOREGROUND:           gdkColor = COLOR_TITLE_INACTIVE_FOREGROUND; break;
-        case SWT.COLOR_TITLE_INACTIVE_BACKGROUND:           gdkColor = COLOR_TITLE_INACTIVE_BACKGROUND; break;
-        case SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT:  gdkColor = COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT; break;
-        case SWT.COLOR_WIDGET_DARK_SHADOW:                  gdkColor = COLOR_WIDGET_DARK_SHADOW; break;
-        case SWT.COLOR_WIDGET_NORMAL_SHADOW:                gdkColor = COLOR_WIDGET_NORMAL_SHADOW; break;
-        case SWT.COLOR_WIDGET_LIGHT_SHADOW:                 gdkColor = COLOR_WIDGET_LIGHT_SHADOW; break;
-        case SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW:             gdkColor = COLOR_WIDGET_HIGHLIGHT_SHADOW; break;
-        case SWT.COLOR_WIDGET_BACKGROUND:                   gdkColor = COLOR_WIDGET_BACKGROUND; break;
-        case SWT.COLOR_WIDGET_FOREGROUND:                   gdkColor = COLOR_WIDGET_FOREGROUND; break;
-        case SWT.COLOR_WIDGET_BORDER:                       gdkColor = COLOR_WIDGET_BORDER; break;
-        case SWT.COLOR_LIST_FOREGROUND:                     gdkColor = COLOR_LIST_FOREGROUND; break;
-        case SWT.COLOR_LIST_BACKGROUND:                     gdkColor = COLOR_LIST_BACKGROUND; break;
-        case SWT.COLOR_LIST_SELECTION:                      gdkColor = COLOR_LIST_SELECTION; break;
-        case SWT.COLOR_LIST_SELECTION_TEXT:                 gdkColor = COLOR_LIST_SELECTION_TEXT; break;
+        case DWT.COLOR_INFO_FOREGROUND:                     gdkColor = COLOR_INFO_FOREGROUND; break;
+        case DWT.COLOR_INFO_BACKGROUND:                     gdkColor = COLOR_INFO_BACKGROUND; break;
+        case DWT.COLOR_TITLE_FOREGROUND:                    gdkColor = COLOR_TITLE_FOREGROUND; break;
+        case DWT.COLOR_TITLE_BACKGROUND:                    gdkColor = COLOR_TITLE_BACKGROUND; break;
+        case DWT.COLOR_TITLE_BACKGROUND_GRADIENT:           gdkColor = COLOR_TITLE_BACKGROUND_GRADIENT; break;
+        case DWT.COLOR_TITLE_INACTIVE_FOREGROUND:           gdkColor = COLOR_TITLE_INACTIVE_FOREGROUND; break;
+        case DWT.COLOR_TITLE_INACTIVE_BACKGROUND:           gdkColor = COLOR_TITLE_INACTIVE_BACKGROUND; break;
+        case DWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT:  gdkColor = COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT; break;
+        case DWT.COLOR_WIDGET_DARK_SHADOW:                  gdkColor = COLOR_WIDGET_DARK_SHADOW; break;
+        case DWT.COLOR_WIDGET_NORMAL_SHADOW:                gdkColor = COLOR_WIDGET_NORMAL_SHADOW; break;
+        case DWT.COLOR_WIDGET_LIGHT_SHADOW:                 gdkColor = COLOR_WIDGET_LIGHT_SHADOW; break;
+        case DWT.COLOR_WIDGET_HIGHLIGHT_SHADOW:             gdkColor = COLOR_WIDGET_HIGHLIGHT_SHADOW; break;
+        case DWT.COLOR_WIDGET_BACKGROUND:                   gdkColor = COLOR_WIDGET_BACKGROUND; break;
+        case DWT.COLOR_WIDGET_FOREGROUND:                   gdkColor = COLOR_WIDGET_FOREGROUND; break;
+        case DWT.COLOR_WIDGET_BORDER:                       gdkColor = COLOR_WIDGET_BORDER; break;
+        case DWT.COLOR_LIST_FOREGROUND:                     gdkColor = COLOR_LIST_FOREGROUND; break;
+        case DWT.COLOR_LIST_BACKGROUND:                     gdkColor = COLOR_LIST_BACKGROUND; break;
+        case DWT.COLOR_LIST_SELECTION:                      gdkColor = COLOR_LIST_SELECTION; break;
+        case DWT.COLOR_LIST_SELECTION_TEXT:                 gdkColor = COLOR_LIST_SELECTION_TEXT; break;
         default:
             return super.getSystemColor (id);
     }
-    if (gdkColor is null) return super.getSystemColor (SWT.COLOR_BLACK);
+    if (gdkColor is null) return super.getSystemColor (DWT.COLOR_BLACK);
     return Color.gtk_new (this, gdkColor);
 }
 
 /**
  * Returns the matching standard platform cursor for the given
  * constant, which should be one of the cursor constants
- * specified in class <code>SWT</code>. This cursor should
+ * specified in class <code>DWT</code>. This cursor should
  * not be free'd because it was allocated by the system,
  * not the application.  A value of <code>null</code> will
- * be returned if the supplied constant is not an SWT cursor
+ * be returned if the supplied constant is not an DWT cursor
  * constant.
  *
- * @param id the SWT cursor constant
+ * @param id the DWT cursor constant
  * @return the corresponding cursor or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
- * @see 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
+ * @see DWT#CURSOR_ARROW
+ * @see DWT#CURSOR_WAIT
+ * @see DWT#CURSOR_CROSS
+ * @see DWT#CURSOR_APPSTARTING
+ * @see DWT#CURSOR_HELP
+ * @see DWT#CURSOR_SIZEALL
+ * @see DWT#CURSOR_SIZENESW
+ * @see DWT#CURSOR_SIZENS
+ * @see DWT#CURSOR_SIZENWSE
+ * @see DWT#CURSOR_SIZEWE
+ * @see DWT#CURSOR_SIZEN
+ * @see DWT#CURSOR_SIZES
+ * @see DWT#CURSOR_SIZEE
+ * @see DWT#CURSOR_SIZEW
+ * @see DWT#CURSOR_SIZENE
+ * @see DWT#CURSOR_SIZESE
+ * @see DWT#CURSOR_SIZESW
+ * @see DWT#CURSOR_SIZENW
+ * @see DWT#CURSOR_UPARROW
+ * @see DWT#CURSOR_IBEAM
+ * @see DWT#CURSOR_NO
+ * @see DWT#CURSOR_HAND
  *
  * @since 3.0
  */
@@ -2044,49 +2044,49 @@
 /**
  * Returns the matching standard platform image for the given
  * constant, which should be one of the icon constants
- * specified in class <code>SWT</code>. This image should
+ * specified in class <code>DWT</code>. This image should
  * not be free'd because it was allocated by the system,
  * not the application.  A value of <code>null</code> will
  * be returned either if the supplied constant is not an
- * SWT icon constant or if the platform does not define an
+ * DWT icon constant or if the platform does not define an
  * image that corresponds to the constant.
  *
- * @param id the SWT icon constant
+ * @param id the DWT icon constant
  * @return the corresponding image or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
- * @see SWT#ICON_ERROR
- * @see SWT#ICON_INFORMATION
- * @see SWT#ICON_QUESTION
- * @see SWT#ICON_WARNING
- * @see SWT#ICON_WORKING
+ * @see DWT#ICON_ERROR
+ * @see DWT#ICON_INFORMATION
+ * @see DWT#ICON_QUESTION
+ * @see DWT#ICON_WARNING
+ * @see DWT#ICON_WORKING
  *
  * @since 3.0
  */
 public Image getSystemImage (int id) {
     checkDevice ();
     switch (id) {
-        case SWT.ICON_ERROR:
+        case DWT.ICON_ERROR:
             if (errorImage is null) {
                 errorImage = createImage ("gtk-dialog-error");
             }
             return errorImage;
-        case SWT.ICON_INFORMATION:
-        case SWT.ICON_WORKING:
+        case DWT.ICON_INFORMATION:
+        case DWT.ICON_WORKING:
             if (infoImage is null) {
                 infoImage = createImage ("gtk-dialog-info");
             }
             return infoImage;
-        case SWT.ICON_QUESTION:
+        case DWT.ICON_QUESTION:
             if (questionImage is null) {
                 questionImage = createImage ("gtk-dialog-question");
             }
             return questionImage;
-        case SWT.ICON_WARNING:
+        case DWT.ICON_WARNING:
             if (warningImage is null) {
                 warningImage = createImage ("gtk-dialog-warning");
             }
@@ -2101,7 +2101,7 @@
 
     /* Get Tooltip resources */
     auto tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
-    if (tooltipShellHandle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (tooltipShellHandle is null) DWT.error (DWT.ERROR_NO_HANDLES);
 //  byte[] gtk_tooltips = Converter.wcsToMbcs (null, "gtk-tooltips", true);
     OS.gtk_widget_set_name (tooltipShellHandle, "gtk-tooltips".ptr );
     OS.gtk_widget_realize (tooltipShellHandle);
@@ -2188,7 +2188,7 @@
  *
  * @return a font
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2207,7 +2207,7 @@
  *
  * @return the system tray or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2216,7 +2216,7 @@
 public Tray getSystemTray () {
     checkDevice ();
     if (tray !is null) return tray;
-    return tray = new Tray (this, SWT.NONE);
+    return tray = new Tray (this, DWT.NONE);
 }
 
 /**
@@ -2224,12 +2224,12 @@
  *
  * @return the receiver's user-interface thread
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Thread getThread () {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
     return thread;
 }
 
@@ -2452,7 +2452,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -2469,7 +2469,7 @@
  * <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
+ * can be shared within the packages provided by DWT. It is not
  * available on all platforms, and should never be called from
  * application code.
  * </p>
@@ -2477,28 +2477,28 @@
  * @param data the platform specific GC data
  * @return the platform specific GC handle
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
- * @exception SWTError <ul>
+ * @exception DWTError <ul>
  *    <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>
  * </ul>
  */
 public GdkGC* internal_new_GC (GCData data) {
-    if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed()) DWT.error(DWT.ERROR_DEVICE_DISPOSED);
     auto root = cast(GdkDrawable *) OS.GDK_ROOT_PARENT ();
     auto gdkGC = OS.gdk_gc_new (root);
-    if (gdkGC is null) SWT.error (SWT.ERROR_NO_HANDLES);
+    if (gdkGC is null) DWT.error (DWT.ERROR_NO_HANDLES);
     OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS);
     if (data !is null) {
-        int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
+        int mask = DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
         if ((data.style & mask) is 0) {
-            data.style |= SWT.LEFT_TO_RIGHT;
+            data.style |= DWT.LEFT_TO_RIGHT;
         }
         data.device = this;
         data.drawable = root;
-        data.background = getSystemColor (SWT.COLOR_WHITE).handle;
-        data.foreground = getSystemColor (SWT.COLOR_BLACK).handle;
+        data.background = getSystemColor (DWT.COLOR_WHITE).handle;
+        data.foreground = getSystemColor (DWT.COLOR_BLACK).handle;
         data.font = getSystemFont ().handle;
     }
     return gdkGC;
@@ -2538,7 +2538,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2547,7 +2547,7 @@
  */
 public Point map (Control from, Control to, Point point) {
     checkDevice ();
-    if (point is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
     return map (from, to, point.x, point.y);
 }
 
@@ -2580,7 +2580,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2589,8 +2589,8 @@
  */
 public Point map (Control from, Control to, int x, int y) {
     checkDevice ();
-    if (from !is null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
-    if (to !is null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (from !is null && from.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
+    if (to !is null && to.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
     Point point = new Point (x, y);
     if (from is to) return point;
     if (from !is null) {
@@ -2639,7 +2639,7 @@
  *    <li>ERROR_NULL_ARGUMENT - if the rectangle is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2648,7 +2648,7 @@
  */
 public Rectangle map (Control from, Control to, Rectangle rectangle) {
     checkDevice();
-    if (rectangle is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (rectangle is null) error (DWT.ERROR_NULL_ARGUMENT);
     return map (from, to, rectangle.x, rectangle.y, rectangle.width, rectangle.height);
 }
 
@@ -2725,7 +2725,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the Control from or the Control to have been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -2734,8 +2734,8 @@
  */
 public Rectangle map (Control from, Control to, int x, int y, int width, int height) {
     checkDevice();
-    if (from !is null && from.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
-    if (to !is null && to.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (from !is null && from.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
+    if (to !is null && to.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
     Rectangle rect = new Rectangle (x, y, width, height);
     if (from is to) return rect;
     if (from !is null) {
@@ -2772,7 +2772,7 @@
  * <code>post</code> is used to generate low level keyboard
  * and mouse events. The intent is to enable automated UI
  * testing by simulating the input from the user.  Most
- * SWT applications should never need to call this method.
+ * DWT applications should never need to call this method.
  * <p>
  * Note that this operation can fail when the operating system
  * fails to generate the event for any reason.  For example,
@@ -2788,7 +2788,7 @@
  * <p> Either one of:
  * <li>(in) character a character that corresponds to a keyboard key</li>
  * <li>(in) keyCode the key code of the key that was typed,
- *          as defined by the key code constants in class <code>SWT</code></li>
+ *          as defined by the key code constants in class <code>DWT</code></li>
  * </ul>
  * <p>MouseDown, MouseUp</p>
  * <p>The following fields in the <code>Event</code> apply:
@@ -2812,7 +2812,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the event is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
@@ -2820,39 +2820,39 @@
  *
  */
 public bool post (Event event) {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
-    if (event is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
+    if (event is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (!OS.GDK_WINDOWING_X11()) return false;
     auto xDisplay = OS.GDK_DISPLAY ();
     int type = event.type;
     switch (type) {
-        case SWT.KeyDown:
-        case SWT.KeyUp: {
+        case DWT.KeyDown:
+        case DWT.KeyUp: {
             int keyCode = 0;
             auto keysym = untranslateKey (event.keyCode);
             if (keysym !is 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
             if (keyCode is 0) {
                 char key = event.character;
                 switch (key) {
-                    case SWT.BS: keysym = OS.GDK_BackSpace; break;
-                    case SWT.CR: keysym = OS.GDK_Return; break;
-                    case SWT.DEL: keysym = OS.GDK_Delete; break;
-                    case SWT.ESC: keysym = OS.GDK_Escape; break;
-                    case SWT.TAB: keysym = OS.GDK_Tab; break;
-                    case SWT.LF: keysym = OS.GDK_Linefeed; break;
+                    case DWT.BS: keysym = OS.GDK_BackSpace; break;
+                    case DWT.CR: keysym = OS.GDK_Return; break;
+                    case DWT.DEL: keysym = OS.GDK_Delete; break;
+                    case DWT.ESC: keysym = OS.GDK_Escape; break;
+                    case DWT.TAB: keysym = OS.GDK_Tab; break;
+                    case DWT.LF: keysym = OS.GDK_Linefeed; break;
                     default:
                         keysym = wcsToMbcs (key);
                 }
                 keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
                 if (keyCode is 0) return false;
             }
-            OS.XTestFakeKeyEvent (xDisplay, keyCode, type is SWT.KeyDown, 0);
+            OS.XTestFakeKeyEvent (xDisplay, keyCode, type is DWT.KeyDown, 0);
             return true;
         }
-        case SWT.MouseDown:
-        case SWT.MouseMove:
-        case SWT.MouseUp: {
-            if (type is SWT.MouseMove) {
+        case DWT.MouseDown:
+        case DWT.MouseMove:
+        case DWT.MouseUp: {
+            if (type is DWT.MouseMove) {
                 OS.XTestFakeMotionEvent (xDisplay, -1, event.x, event.y, 0);
             } else {
                 int button = event.button;
@@ -2864,7 +2864,7 @@
                     case 5: button = 7; break;
                     default: return false;
                 }
-                OS.XTestFakeButtonEvent (xDisplay, button, type is SWT.MouseDown, 0);
+                OS.XTestFakeButtonEvent (xDisplay, button, type is DWT.MouseDown, 0);
             }
             return true;
         default:
@@ -2874,10 +2874,10 @@
         * mouse wheel event the system may respond unpredictably
         * to subsequent mouse actions.
         */
-//      case SWT.MouseWheel: {
+//      case DWT.MouseWheel: {
 //          if (event.count is 0) return false;
 //          int button = event.count < 0 ? 5 : 4;
-//          OS.XTestFakeButtonEvent (xDisplay, button, type is SWT.MouseWheel, 0);
+//          OS.XTestFakeButtonEvent (xDisplay, button, type is DWT.MouseWheel, 0);
 //      }
     }
     return false;
@@ -2936,7 +2936,7 @@
  *
  * @return <code>false</code> if the caller can sleep upon return from this method
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_FAILED_EXEC - if an exception occurred while running an inter-thread message</li>
@@ -2996,7 +2996,7 @@
  * @see #destroy
  */
 protected void release () {
-    sendEvent (SWT.Dispose, new Event ());
+    sendEvent (DWT.Dispose, new Event ());
     Shell [] shells = getShells ();
     for (int i=0; i<shells.length; i++) {
         Shell shell = shells [i];
@@ -3126,7 +3126,7 @@
  * Removes the listener from the collection of listeners who will
  * be notified when an event of the given type occurs anywhere in
  * a widget. The event type is one of the event constants defined
- * in class <code>SWT</code>.
+ * in class <code>DWT</code>.
  *
  * @param eventType the type of event to listen for
  * @param listener the listener which should no longer be notified when the event occurs
@@ -3134,12 +3134,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  *
  * @see Listener
- * @see SWT
+ * @see DWT
  * @see #addFilter
  * @see #addListener
  *
@@ -3147,7 +3147,7 @@
  */
 public void removeFilter (int eventType, Listener listener) {
     checkDevice ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (filterTable is null) return;
     filterTable.unhook (eventType, listener);
     if (filterTable.size () is 0) filterTable = null;
@@ -3178,7 +3178,7 @@
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when an event of the given type occurs. The event type
- * is one of the event constants defined in class <code>SWT</code>.
+ * is one of the event constants defined in class <code>DWT</code>.
  *
  * @param eventType the type of event to listen for
  * @param listener the listener which should no longer be notified when the event occurs
@@ -3186,20 +3186,20 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see Listener
- * @see SWT
+ * @see DWT
  * @see #addListener
  *
  * @since 2.0
  */
 public void removeListener (int eventType, Listener listener) {
     checkDevice ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
     eventTable.unhook (eventType, listener);
 }
@@ -3298,7 +3298,7 @@
     runSettingsFld = false;
     saveResources ();
     initializeSystemColors ();
-    sendEvent (SWT.Settings, null);
+    sendEvent (DWT.Settings, null);
     Shell [] shells = getShells ();
     for (int i=0; i<shells.length; i++) {
         Shell shell = shells [i];
@@ -3331,7 +3331,7 @@
  * @param x the new x coordinate for the cursor
  * @param y the new y coordinate for the cursor
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3354,7 +3354,7 @@
  *
  * @param point new position
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
@@ -3364,7 +3364,7 @@
  */
 public void setCursorLocation (Point point) {
     checkDevice ();
-    if (point is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
     setCursorLocation (point.x, point.y);
 }
 
@@ -3385,7 +3385,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3395,7 +3395,7 @@
  */
 public void setData (char[] key, Object value) {
     checkDevice ();
-    if (key is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
 
     if (key==/*eq*/ DISPATCH_EVENT_KEY) {
         ArrayWrapperInt wrappedValue;
@@ -3408,7 +3408,7 @@
 
     if (key==/*eq*/ ADD_WIDGET_KEY) {
         auto wrap = cast(ArrayWrapperObject) value;
-        if( wrap is null ) SWT.error(SWT.ERROR_INVALID_ARGUMENT, null, " []");
+        if( wrap is null ) DWT.error(DWT.ERROR_INVALID_ARGUMENT, null, " []");
         Object [] data = wrap.array;
         auto handle = (cast(LONG) data [0]).value;
         Widget widget = cast(Widget) data [1];
@@ -3487,7 +3487,7 @@
  *
  * @param data the new display specific data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3521,7 +3521,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the synchronizer is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_FAILED_EXEC - if an exception occurred while running an inter-thread message</li>
@@ -3529,7 +3529,7 @@
  */
 public void setSynchronizer (Synchronizer synchronizer) {
     checkDevice ();
-    if (synchronizer is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (synchronizer is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (this.synchronizer !is null) {
         this.synchronizer.runAsyncMessages(true);
     }
@@ -3540,9 +3540,9 @@
     imControl = control;
     if (preeditWindow is null) {
         preeditWindow = cast(GtkWindow*)OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
-        if (preeditWindow is null) error (SWT.ERROR_NO_HANDLES);
+        if (preeditWindow is null) error (DWT.ERROR_NO_HANDLES);
         preeditLabel = cast(GtkLabel*) OS.gtk_label_new (null);
-        if (preeditLabel is null) error (SWT.ERROR_NO_HANDLES);
+        if (preeditLabel is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)preeditWindow, cast(GtkWidget*) preeditLabel);
         OS.gtk_widget_show (cast(GtkWidget*)preeditLabel);
     }
@@ -3578,7 +3578,7 @@
  *
  * @return <code>true</code> if an event requiring dispatching was placed on the queue.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3662,7 +3662,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the runnable is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3671,7 +3671,7 @@
  */
 public void timerExec (int milliseconds, Runnable runnable) {
     checkDevice ();
-    if (runnable is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (runnable is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (timerList is null) timerList = new Runnable [4];
     if (timerIds is null) timerIds = new int [4];
     int index = 0;
@@ -3897,7 +3897,7 @@
  *
  * @param runnable code to run on the user-interface thread or <code>null</code>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_FAILED_EXEC - if an exception occurred when executing the runnable</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3905,7 +3905,7 @@
  * @see #asyncExec
  */
 public void syncExec (Runnable runnable) {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
     synchronized (idleLock) {
         if (idleNeeded && idleHandle is 0) {
             //NOTE: calling unlocked function in OS
@@ -3936,7 +3936,7 @@
  * Forces all outstanding paint requests for the display
  * to be processed before this method returns.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
@@ -3954,14 +3954,14 @@
  * causes it to be awakened and start running again. Note that this
  * method may be called from any thread.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  *
  * @see #sleep
  */
 public void wake () {
-    if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+    if (isDisposed ()) error (DWT.ERROR_DEVICE_DISPOSED);
     if (thread is Thread.getThis ()) return;
     wakeThread ();
 }
--- a/dwt/widgets/Event.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Event.d	Tue Jan 15 06:44:34 2008 +0100
@@ -21,7 +21,7 @@
 
 /**
  * Instances of this class provide a description of a particular
- * event which occurred within SWT. The SWT <em>untyped listener</em>
+ * event which occurred within DWT. The DWT <em>untyped listener</em>
  * API uses these instances for all event dispatching.
  * <p>
  * Note: For a given event, only the fields which are appropriate
@@ -49,17 +49,17 @@
 
     /**
      * the type of event, as defined by the event type constants
-     * in class <code>SWT</code>
+     * in class <code>DWT</code>
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int type;
 
     /**
      * the event specific detail field, as defined by the detail constants
-     * in class <code>SWT</code>
+     * in class <code>DWT</code>
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int detail;
 
@@ -141,21 +141,21 @@
      * after all modifiers have been applied.  For example, when the
      * user types Ctrl+A, the character value is 0x01 (ASCII SOH).
      * It is important that applications do not attempt to modify the
-     * character value based on a stateMask (such as SWT.CTRL) or the
+     * character value based on a stateMask (such as DWT.CTRL) or the
      * resulting character will not be correct.
      */
     public char character;
 
     /**
      * depending on the event, the key code of the key that was typed,
-     * as defined by the key code constants in class <code>SWT</code>.
+     * as defined by the key code constants in class <code>DWT</code>.
      * When the character field of the event is ambiguous, this field
      * contains the unaffected value of the original character.  For
      * example, typing Ctrl+M or Enter both result in the character '\r'
      * but the keyCode field will also contain '\r' when Enter was typed
      * and 'm' when Ctrl+M was typed.
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int keyCode;
 
@@ -163,7 +163,7 @@
      * depending on the event, the state of the keyboard modifier
      * keys and mouse masks at the time the event was generated.
      *
-     * @see dwt.SWT
+     * @see dwt.DWT
      */
     public int stateMask;
 
--- a/dwt/widgets/EventTable.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/EventTable.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,10 +14,10 @@
 import dwt.widgets.Event;
 import dwt.widgets.Listener;
 import dwt.widgets.TypedListener;
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 import dwt.dwthelper.System;
-import dwt.SWT;
-import dwt.internal.SWTEventListener;
+import dwt.DWT;
+import dwt.internal.DWTEventListener;
 
 /+
 class EventTable{
@@ -26,7 +26,7 @@
     public void sendEvent (Event event) {}
     public bool hooks (int eventType) { return false; }
     public void unhook (int eventType, Listener listener) {}
-    public void unhook (int eventType, SWTEventListener listener) {}
+    public void unhook (int eventType, DWTEventListener listener) {}
     public int size () { return 0;}
 }
 +/
@@ -78,7 +78,7 @@
     level += level >= 0 ? 1 : -1;
     try {
         for (int i=0; i<types.length; i++) {
-            if (event.type is SWT.None) return;
+            if (event.type is DWT.None) return;
             if (types [i] is event.type) {
                 Listener listener = listeners [i];
                 if (listener !is null) listener.handleEvent (event);
@@ -136,7 +136,7 @@
     }
 }
 
-public void unhook (int eventType, SWTEventListener listener) {
+public void unhook (int eventType, DWTEventListener listener) {
     if (types is null) return;
     for (int i=0; i<types.length; i++) {
         if (types [i] is eventType) {
--- a/dwt/widgets/Group.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Group.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.Group;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
@@ -49,10 +49,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -63,16 +63,16 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#SHADOW_ETCHED_IN
+ * @see DWT#SHADOW_ETCHED_OUT
+ * @see DWT#SHADOW_IN
+ * @see DWT#SHADOW_OUT
+ * @see DWT#SHADOW_NONE
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -81,19 +81,19 @@
 }
 
 static int checkStyle (int style) {
-    style |= SWT.NO_FOCUS;
+    style |= DWT.NO_FOCUS;
     /*
     * 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.
+    * the DWT style.
     */
-    return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
+    return style & ~(DWT.H_SCROLL | DWT.V_SCROLL);
 }
 
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 GtkWidget* clientHandle () {
@@ -102,7 +102,7 @@
 
 public Point computeSize (int wHint, int hHint, bool changed) {
     Point size = super.computeSize(wHint, hHint, changed);
-    int width = computeNativeSize (handle, SWT.DEFAULT, SWT.DEFAULT, false).x;
+    int width = computeNativeSize (handle, DWT.DEFAULT, DWT.DEFAULT, false).x;
     size.x = Math.max (size.x, width);
     return size;
 }
@@ -121,28 +121,28 @@
 void createHandle(int index) {
     state |= HANDLE | THEME_BACKGROUND;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     handle = OS.gtk_frame_new (null);
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     labelHandle = cast(GtkWidget*)OS.gtk_label_new (null);
-    if (labelHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (labelHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.g_object_ref (labelHandle);
     OS.gtk_object_sink (cast(GtkObject*)labelHandle);
     clientHandle_ = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (clientHandle_ is null) error (SWT.ERROR_NO_HANDLES);
+    if (clientHandle_ is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
     OS.gtk_container_add (cast(GtkContainer*)handle, clientHandle_);
-    if ((style & SWT.SHADOW_IN) !is 0) {
+    if ((style & DWT.SHADOW_IN) !is 0) {
         OS.gtk_frame_set_shadow_type (cast(GtkFrame*)handle, OS.GTK_SHADOW_IN);
     }
-    if ((style & SWT.SHADOW_OUT) !is 0) {
+    if ((style & DWT.SHADOW_OUT) !is 0) {
         OS.gtk_frame_set_shadow_type (cast(GtkFrame*)handle, OS.GTK_SHADOW_OUT);
     }
-    if ((style & SWT.SHADOW_ETCHED_IN) !is 0) {
+    if ((style & DWT.SHADOW_ETCHED_IN) !is 0) {
         OS.gtk_frame_set_shadow_type (cast(GtkFrame*)handle, OS.GTK_SHADOW_ETCHED_IN);
     }
-    if ((style & SWT.SHADOW_ETCHED_OUT) !is 0) {
+    if ((style & DWT.SHADOW_ETCHED_OUT) !is 0) {
         OS.gtk_frame_set_shadow_type (cast(GtkFrame*)handle, OS.GTK_SHADOW_ETCHED_OUT);
     }
 }
@@ -172,7 +172,7 @@
  *
  * @return the text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -243,7 +243,7 @@
 
 override void setOrientation () {
     super.setOrientation ();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         OS.gtk_widget_set_direction (labelHandle, OS.GTK_TEXT_DIR_RTL);
     }
 }
@@ -267,14 +267,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     text = string;
     char [] chars = fixMnemonic (string);
     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars));
--- a/dwt/widgets/Item.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Item.d	Tue Jan 15 06:44:34 2008 +0100
@@ -12,7 +12,7 @@
 
 
 import dwt.widgets.Widget;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Image;
 
 /**
@@ -37,10 +37,10 @@
  * The item is added to the end of the items maintained by its parent.
  * <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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -51,11 +51,11 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  * </ul>
  *
- * @see SWT
+ * @see DWT
  * @see Widget#getStyle
  */
 public this (Widget parent, int style) {
@@ -70,10 +70,10 @@
  * by its parent.
  * <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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -86,11 +86,11 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the parent (inclusive)</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  * </ul>
  *
- * @see SWT
+ * @see DWT
  * @see Widget#getStyle
  */
 public this (Widget parent, int style, int index) {
@@ -107,7 +107,7 @@
  *
  * @return the receiver's image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -127,7 +127,7 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -152,14 +152,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (image !is null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+    if (image !is null && image.isDisposed()) error(DWT.ERROR_INVALID_ARGUMENT);
     this.image = image;
 }
 
@@ -171,14 +171,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     text = string;
 }
 
--- a/dwt/widgets/Label.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Label.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.Label;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.graphics.Image;
@@ -40,7 +40,7 @@
  * 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.
+ * within the DWT implementation.
  * </p>
  */
 public class Label : Control {
@@ -54,10 +54,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -68,21 +68,21 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#SEPARATOR
+ * @see DWT#HORIZONTAL
+ * @see DWT#VERTICAL
+ * @see DWT#SHADOW_IN
+ * @see DWT#SHADOW_OUT
+ * @see DWT#SHADOW_NONE
+ * @see DWT#CENTER
+ * @see DWT#LEFT
+ * @see DWT#RIGHT
+ * @see DWT#WRAP
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -91,12 +91,12 @@
 }
 
 static int checkStyle (int style) {
-    style |= SWT.NO_FOCUS;
-    if ((style & SWT.SEPARATOR) !is 0) {
-        style = checkBits (style, SWT.VERTICAL, SWT.HORIZONTAL, 0, 0, 0, 0);
-        return checkBits (style, SWT.SHADOW_OUT, SWT.SHADOW_IN, SWT.SHADOW_NONE, 0, 0, 0);
+    style |= DWT.NO_FOCUS;
+    if ((style & DWT.SEPARATOR) !is 0) {
+        style = checkBits (style, DWT.VERTICAL, DWT.HORIZONTAL, 0, 0, 0, 0);
+        return checkBits (style, DWT.SHADOW_OUT, DWT.SHADOW_IN, DWT.SHADOW_NONE, 0, 0, 0);
     }
-    return checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0);
+    return checkBits (style, DWT.LEFT, DWT.CENTER, DWT.RIGHT, 0, 0, 0);
 }
 
 void addRelation (Control control) {
@@ -111,16 +111,16 @@
 
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
-    if ((style & SWT.SEPARATOR) !is 0) {
-        if ((style & SWT.HORIZONTAL) !is 0) {
-            if (wHint is SWT.DEFAULT) wHint = DEFAULT_WIDTH;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
+    if ((style & DWT.SEPARATOR) !is 0) {
+        if ((style & DWT.HORIZONTAL) !is 0) {
+            if (wHint is DWT.DEFAULT) wHint = DEFAULT_WIDTH;
         } else {
-            if (hHint is SWT.DEFAULT) hHint = DEFAULT_HEIGHT;
+            if (hHint is DWT.DEFAULT) hHint = DEFAULT_HEIGHT;
         }
     }
-    bool fixWrap = labelHandle !is null && (style & SWT.WRAP) !is 0;
+    bool fixWrap = labelHandle !is null && (style & DWT.WRAP) !is 0;
     if (fixWrap || frameHandle !is null) forceResize ();
     int labelWidth, labelHeight;
     if (fixWrap) {
@@ -149,7 +149,7 @@
     * NOTE: This work around does not fix the case when there are
     * muliple lines of text.
     */
-    if (hHint is SWT.DEFAULT && labelHandle !is null) {
+    if (hHint is DWT.DEFAULT && labelHandle !is null) {
         auto layout = OS.gtk_label_get_layout (cast(GtkLabel*)labelHandle);
         auto context = OS.pango_layout_get_context (layout);
         auto lang = OS.pango_context_get_language (context);
@@ -175,49 +175,49 @@
 void createHandle (int index) {
     state |= HANDLE | THEME_BACKGROUND;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
-    if ((style & SWT.SEPARATOR) !is 0) {
-        if ((style & SWT.HORIZONTAL)!is 0) {
+    if ((style & DWT.SEPARATOR) !is 0) {
+        if ((style & DWT.HORIZONTAL)!is 0) {
             handle = OS.gtk_hseparator_new ();
         } else {
             handle = OS.gtk_vseparator_new ();
         }
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
     } else {
         handle = OS.gtk_hbox_new (false, 0);
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
         labelHandle = OS.gtk_label_new_with_mnemonic (null);
-        if (labelHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (labelHandle is null) error (DWT.ERROR_NO_HANDLES);
         imageHandle = OS.gtk_image_new ();
-        if (imageHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (imageHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)handle, labelHandle);
         OS.gtk_container_add (cast(GtkContainer*)handle, imageHandle);
     }
-    if ((style & SWT.BORDER) !is 0) {
+    if ((style & DWT.BORDER) !is 0) {
         frameHandle = OS.gtk_frame_new (null);
-        if (frameHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (frameHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, frameHandle);
         OS.gtk_container_add (cast(GtkContainer*)frameHandle, handle);
         OS.gtk_frame_set_shadow_type (cast(GtkFrame*)frameHandle, OS.GTK_SHADOW_ETCHED_IN);
     } else {
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
     }
-    if ((style & SWT.SEPARATOR) !is 0) return;
-    if ((style & SWT.WRAP) !is 0) OS.gtk_label_set_line_wrap (cast(GtkLabel*)labelHandle, true);
-    if ((style & SWT.LEFT) !is 0) {
+    if ((style & DWT.SEPARATOR) !is 0) return;
+    if ((style & DWT.WRAP) !is 0) OS.gtk_label_set_line_wrap (cast(GtkLabel*)labelHandle, true);
+    if ((style & DWT.LEFT) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.0f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_LEFT);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.0f, 0.5f);
         return;
     }
-    if ((style & SWT.CENTER) !is 0) {
+    if ((style & DWT.CENTER) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.5f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_CENTER);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.5f, 0.5f);
         return;
     }
-    if ((style & SWT.RIGHT) !is 0) {
+    if ((style & DWT.RIGHT) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 1.0f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_RIGHT);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1.0f, 0.5f);
@@ -250,18 +250,18 @@
  *
  * @return the alignment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SEPARATOR) !is 0) return 0;
-    if ((style & SWT.LEFT) !is 0) return SWT.LEFT;
-    if ((style & SWT.CENTER) !is 0) return SWT.CENTER;
-    if ((style & SWT.RIGHT) !is 0) return SWT.RIGHT;
-    return SWT.LEFT;
+    if ((style & DWT.SEPARATOR) !is 0) return 0;
+    if ((style & DWT.LEFT) !is 0) return DWT.LEFT;
+    if ((style & DWT.CENTER) !is 0) return DWT.CENTER;
+    if ((style & DWT.RIGHT) !is 0) return DWT.RIGHT;
+    return DWT.LEFT;
 }
 
 public int getBorderWidth () {
@@ -278,7 +278,7 @@
  *
  * @return the receiver's image
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -299,14 +299,14 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 char[] getText () {
     checkWidget ();
-    if ((style & SWT.SEPARATOR) !is 0) return "";
+    if ((style & DWT.SEPARATOR) !is 0) return "";
     return text;
 }
 
@@ -382,31 +382,31 @@
  *
  * @param alignment the new alignment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SEPARATOR) !is 0) return;
-    if ((alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER)) is 0) return;
-    style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
-    style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
-    bool isRTL = (style & SWT.RIGHT_TO_LEFT) !is 0;
-    if ((style & SWT.LEFT) !is 0) {
+    if ((style & DWT.SEPARATOR) !is 0) return;
+    if ((alignment & (DWT.LEFT | DWT.RIGHT | DWT.CENTER)) is 0) return;
+    style &= ~(DWT.LEFT | DWT.RIGHT | DWT.CENTER);
+    style |= alignment & (DWT.LEFT | DWT.RIGHT | DWT.CENTER);
+    bool isRTL = (style & DWT.RIGHT_TO_LEFT) !is 0;
+    if ((style & DWT.LEFT) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.0f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, isRTL ? OS.GTK_JUSTIFY_RIGHT : OS.GTK_JUSTIFY_LEFT);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.0f, 0.5f);
         return;
     }
-    if ((style & SWT.CENTER) !is 0) {
+    if ((style & DWT.CENTER) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 0.5f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_CENTER);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 0.5f, 0.5f);
         return;
     }
-    if ((style & SWT.RIGHT) !is 0) {
+    if ((style & DWT.RIGHT) !is 0) {
         OS.gtk_misc_set_alignment (cast(GtkMisc*)labelHandle, 1.0f, 0.0f);
         OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, isRTL ? OS.GTK_JUSTIFY_LEFT : OS.GTK_JUSTIFY_RIGHT);
         OS.gtk_misc_set_alignment (cast(GtkMisc*)imageHandle, 1.0f, 0.5f);
@@ -435,7 +435,7 @@
     * resized to the preferred size but it still
     * won't draw properly.
     */
-    bool fixWrap = resize && labelHandle !is null && (style & SWT.WRAP) !is 0;
+    bool fixWrap = resize && labelHandle !is null && (style & DWT.WRAP) !is 0;
     if (fixWrap) OS.gtk_widget_set_size_request (labelHandle, -1, -1);
     int result = super.setBounds (x, y, width, height, move, resize);
     /*
@@ -485,13 +485,13 @@
 
 void setOrientation () {
     super.setOrientation ();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (labelHandle !is null) OS.gtk_widget_set_direction (labelHandle, OS.GTK_TEXT_DIR_RTL);
         if (imageHandle !is null) OS.gtk_widget_set_direction (imageHandle, OS.GTK_TEXT_DIR_RTL);
-        if ((style & SWT.LEAD) !is 0) {
+        if ((style & DWT.LEAD) !is 0) {
             if (labelHandle !is null) OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_RIGHT);
         }
-        if ((style & SWT.TRAIL) !is 0) {
+        if ((style & DWT.TRAIL) !is 0) {
             if (labelHandle !is null) OS.gtk_label_set_justify (cast(GtkLabel*)labelHandle, OS.GTK_JUSTIFY_LEFT);
         }
     }
@@ -506,14 +506,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SEPARATOR) !is 0) return;
+    if ((style & DWT.SEPARATOR) !is 0) return;
     this.image = image;
     if (imageList !is null) imageList.dispose ();
     imageList = null;
@@ -553,15 +553,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.SEPARATOR) !is 0) return;
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.SEPARATOR) !is 0) return;
     text = string;
     char [] chars = fixMnemonic (string);
     OS.gtk_label_set_text_with_mnemonic (cast(GtkLabel*)labelHandle, toStringz(chars));
--- a/dwt/widgets/Layout.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Layout.d	Tue Jan 15 06:44:34 2008 +0100
@@ -45,8 +45,8 @@
  * </p>
  *
  * @param composite a composite widget using this layout
- * @param wHint width (<code>SWT.DEFAULT</code> for preferred size)
- * @param hHint height (<code>SWT.DEFAULT</code> for preferred size)
+ * @param wHint width (<code>DWT.DEFAULT</code> for preferred size)
+ * @param hHint height (<code>DWT.DEFAULT</code> for preferred size)
  * @param flushCache <code>true</code> means flush cached layout values
  * @return a point containing the computed size (width, height)
  *
--- a/dwt/widgets/List.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/List.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.List;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
@@ -54,10 +54,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -68,13 +68,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#SINGLE
+ * @see DWT#MULTI
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -90,7 +90,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -99,7 +99,7 @@
  */
 public void add (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     char* buffer = toStringz(string);
     GtkTreeIter iter;
     OS.gtk_list_store_append (cast(GtkListStore*)modelHandle, &iter);
@@ -122,7 +122,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -131,10 +131,10 @@
  */
 public void add (char[] string, int index) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     int count = OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     if (!(0 <= index && index <= count)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     char* buffer = toStringz(string);
     GtkTreeIter iter;
@@ -165,7 +165,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -176,50 +176,50 @@
  */
 public void addSelectionListener(SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
+    return checkBits (style, DWT.SINGLE, DWT.MULTI, 0, 0, 0, 0);
 }
 
 void createHandle (int index) {
     state |= HANDLE;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     scrolledHandle = cast(GtkWidget*)OS.gtk_scrolled_window_new (null, null);
-    if (scrolledHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (scrolledHandle is null) error (DWT.ERROR_NO_HANDLES);
     /*
     * Columns:
     * 0 - text
     */
     auto types = [OS.G_TYPE_STRING ()];
     modelHandle = cast(GtkWidget*)OS.gtk_list_store_newv (types.length, cast(uint*)types.ptr);
-    if (modelHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (modelHandle is null) error (DWT.ERROR_NO_HANDLES);
     handle = OS.gtk_tree_view_new_with_model (modelHandle);
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     auto textRenderer = OS.gtk_cell_renderer_text_new ();
-    if (textRenderer is null) error (SWT.ERROR_NO_HANDLES);
+    if (textRenderer is null) error (DWT.ERROR_NO_HANDLES);
     auto columnHandle = OS.gtk_tree_view_column_new ();
-    if (columnHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (columnHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_tree_view_column_pack_start (cast(GtkTreeViewColumn*)columnHandle, textRenderer, true);
     OS.gtk_tree_view_column_add_attribute (cast(GtkTreeViewColumn*)columnHandle, textRenderer, OS.text.ptr, TEXT_COLUMN);
     OS.gtk_tree_view_insert_column (cast(GtkTreeView*)handle, columnHandle, index);
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, scrolledHandle);
     OS.gtk_container_add (cast(GtkContainer*)scrolledHandle, handle);
 
-    int mode = (style & SWT.MULTI) !is 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
+    int mode = (style & DWT.MULTI) !is 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
     auto selectionHandle = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
     OS.gtk_tree_selection_set_mode (selectionHandle, mode);
     OS.gtk_tree_view_set_headers_visible (cast(GtkTreeView*)handle, false);
-    int hsp = (style & SWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-    int vsp = (style & SWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
+    int hsp = (style & DWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
+    int vsp = (style & DWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
     OS.gtk_scrolled_window_set_policy (cast(GtkScrolledWindow*)scrolledHandle, hsp, vsp);
-    if ((style & SWT.BORDER) !is 0) OS.gtk_scrolled_window_set_shadow_type (cast(GtkScrolledWindow*)scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+    if ((style & DWT.BORDER) !is 0) OS.gtk_scrolled_window_set_shadow_type (cast(GtkScrolledWindow*)scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
     /*
     * Bug in GTK. When a treeview is the child of an override shell,
     * and if the user has ever invokes the interactive search field,
@@ -227,7 +227,7 @@
     * faults. The fix is to disable the search field in an override
     * shell.
     */
-    if ((getShell ().style & SWT.ON_TOP) !is 0) {
+    if ((getShell ().style & DWT.ON_TOP) !is 0) {
         /*
         * Bug in GTK. Until GTK 2.6.5, calling gtk_tree_view_set_enable_search(FALSE)
         * would prevent the user from being able to type in text to search the tree.
@@ -248,8 +248,8 @@
 
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     Point size = computeNativeSize (handle, wHint, hHint, changed);
     Rectangle trim = computeTrim (0, 0, size.x, size.y);
     size.x = trim.width;
@@ -269,7 +269,7 @@
  *
  * @param index the index of the item to deselect
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -295,7 +295,7 @@
  * @param start the start index of the items to deselect
  * @param end the end index of the items to deselect
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -329,14 +329,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the set of indices is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if (indices is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (indices is null) error (DWT.ERROR_NULL_ARGUMENT);
     GtkTreeIter iter;
     int count = OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
@@ -353,7 +353,7 @@
 /**
  * Deselects all selected items in the receiver.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -400,7 +400,7 @@
  *
  * @return the index of the selected item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -431,7 +431,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -439,7 +439,7 @@
 public char[] getItem (int index) {
     checkWidget();
     if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null)))  {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     char* ptr;
     GtkTreeIter iter;
@@ -456,7 +456,7 @@
  *
  * @return the number of items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -472,7 +472,7 @@
  *
  * @return the height of one item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -506,7 +506,7 @@
  *
  * @return the items in the receiver's list
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -540,7 +540,7 @@
  * </p>
  * @return an array representing the selection
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -560,7 +560,7 @@
  *
  * @return the number of selected items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -583,7 +583,7 @@
  *
  * @return the index of the selected item or -1
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -635,7 +635,7 @@
  * </p>
  * @return the array of indices of the selected items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -687,7 +687,7 @@
  *
  * @return the index of the top item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -706,7 +706,7 @@
 }
 
 override int /*long*/ gtk_changed (GtkWidget* widget) {
-    postEvent (SWT.Selection);
+    postEvent (DWT.Selection);
     return 0;
 }
 
@@ -740,7 +740,7 @@
     * is the set the cursor item to be same as the clicked item to stop the
     * widget from automatically selecting the first item.
     */
-    if ((style & SWT.SINGLE) !is 0 && getSelectionCount () is 0) {
+    if ((style & DWT.SINGLE) !is 0 && getSelectionCount () is 0) {
         GtkTreePath* path;
         if (OS.gtk_tree_view_get_path_at_pos (cast(GtkTreeView*)handle, cast(int)gdkEvent.x, cast(int)gdkEvent.y, &path, null, null, null)) {
             if (path  !is null) {
@@ -777,7 +777,7 @@
         switch (key) {
             case OS.GDK_Return:
             case OS.GDK_KP_Enter: {
-                postEvent (SWT.DefaultSelection);
+                postEvent (DWT.DefaultSelection);
                 break;
             }
             default:
@@ -801,7 +801,7 @@
 }
 
 override int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {
-    postEvent (SWT.DefaultSelection);
+    postEvent (DWT.DefaultSelection);
     return 0;
 }
 
@@ -826,7 +826,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -850,14 +850,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string, int start) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     char[] [] items = getItems ();
     for (int i=start; i<items.length; i++) {
         if (items [i] ==/*eq*/ (string)) return i;
@@ -873,7 +873,7 @@
  * @param index the index of the item
  * @return the selection state of the item at the index
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -913,7 +913,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -921,7 +921,7 @@
 public void remove (int index) {
     checkWidget();
     if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null)))  {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     GtkTreeIter iter;
     OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index);
@@ -942,7 +942,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -952,7 +952,7 @@
     if (start > end) return;
     int count =  OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     if (!(0 <= start && start <= end && end < count)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     GtkTreeIter iter;
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
@@ -975,16 +975,16 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 remove (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     int index = indexOf (string, 0);
-    if (index is -1) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (index is -1) error (DWT.ERROR_INVALID_ARGUMENT);
     remove (index);
 }
 
@@ -998,14 +998,14 @@
  *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
  *    <li>ERROR_NULL_ARGUMENT - if the indices array is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 remove (int [] indices) {
     checkWidget();
-    if (indices is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (indices is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (indices.length is 0) return;
     int [] newIndices = new int []( indices.length );
     System.arraycopy (indices, 0, newIndices, 0, indices.length);
@@ -1013,7 +1013,7 @@
     int start = newIndices [newIndices.length - 1], end = newIndices [0];
     int count = getItemCount();
     if (!(0 <= start && start <= end && end < count)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     GtkTreeIter iter;
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
@@ -1033,7 +1033,7 @@
 /**
  * Removes all of the items from the receiver.
  * <p>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1055,7 +1055,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1065,10 +1065,10 @@
  */
 public void removeSelectionListener(SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 /**
@@ -1078,7 +1078,7 @@
  *
  * @param index the index of the item to select
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1091,7 +1091,7 @@
     OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
     OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index);
     OS.gtk_tree_selection_select_iter (selection, &iter);
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         auto path = OS.gtk_tree_model_get_path (cast(GtkTreeStore*)modelHandle, &iter);
         OS.gtk_tree_view_set_cursor (cast(GtkTreeView*)handle, path, null, false);
         OS.gtk_tree_path_free (path);
@@ -1114,7 +1114,7 @@
  * @param start the start of the range
  * @param end the end of the range
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1123,7 +1123,7 @@
  */
 public void select (int start, int end) {
     checkWidget ();
-    if (end < 0 || start > end || ((style & SWT.SINGLE) !is 0 && start !is end)) return;
+    if (end < 0 || start > end || ((style & DWT.SINGLE) !is 0 && start !is end)) return;
     int count = OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     if (count is 0 || start >= count) return;
     start = Math.max (0, start);
@@ -1134,7 +1134,7 @@
     for (int index=start; index<=end; index++) {
         OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index);
         OS.gtk_tree_selection_select_iter (selection, &iter);
-        if ((style & SWT.SINGLE) !is 0) {
+        if ((style & DWT.SINGLE) !is 0) {
             auto path = OS.gtk_tree_model_get_path (cast(GtkTreeStore*)modelHandle, &iter);
             OS.gtk_tree_view_set_cursor (cast(GtkTreeView*)handle, path, null, false);
             OS.gtk_tree_path_free (path);
@@ -1158,7 +1158,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1167,9 +1167,9 @@
  */
 public void select (int [] indices) {
     checkWidget ();
-    if (indices is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (indices is null) error (DWT.ERROR_NULL_ARGUMENT);
     int length = indices.length;
-    if (length is 0 || ((style & SWT.SINGLE) !is 0 && length > 1)) return;
+    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
     GtkTreeIter iter;
     int count = OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
@@ -1179,7 +1179,7 @@
         if (!(0 <= index && index < count)) continue;
         OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index);
         OS.gtk_tree_selection_select_iter (selection, &iter);
-        if ((style & SWT.SINGLE) !is 0) {
+        if ((style & DWT.SINGLE) !is 0) {
             auto path = OS.gtk_tree_model_get_path (cast(GtkTreeStore*)modelHandle, &iter);
             OS.gtk_tree_view_set_cursor (cast(GtkTreeView*)handle, path, null, false);
             OS.gtk_tree_path_free (path);
@@ -1193,14 +1193,14 @@
  * <p>
  * If the receiver is single-select, do nothing.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if ((style & SWT.SINGLE) !is 0) return;
+    if ((style & DWT.SINGLE) !is 0) return;
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
     OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
     OS.gtk_tree_selection_select_all (selection);
@@ -1273,16 +1273,16 @@
  *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setItem (int index, char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null)))  {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     GtkTreeIter iter;
     OS.gtk_tree_model_iter_nth_child (cast(GtkTreeStore*)modelHandle, &iter, null, index);
@@ -1299,16 +1299,16 @@
  *    <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if an item in the items array is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setItems (char[] [] items) {
     checkWidget();
-    if (items is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (items is null) error (DWT.ERROR_NULL_ARGUMENT);
     for (int i=0; i<items.length; i++) {
-        if (items [i] is null) error (SWT.ERROR_INVALID_ARGUMENT);
+        if (items [i] is null) error (DWT.ERROR_INVALID_ARGUMENT);
     }
     auto selection = OS.gtk_tree_view_get_selection (cast(GtkTreeView*)handle);
     OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
@@ -1331,7 +1331,7 @@
  *
  * @param index the index of the item to select
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1358,7 +1358,7 @@
  * @param start the start index of the items to select
  * @param end the end index of the items to select
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1369,13 +1369,13 @@
 public void setSelection (int start, int end) {
     checkWidget ();
     deselectAll ();
-    if (end < 0 || start > end || ((style & SWT.SINGLE) !is 0 && start !is end)) return;
+    if (end < 0 || start > end || ((style & DWT.SINGLE) !is 0 && start !is end)) return;
     int count = OS.gtk_tree_model_iter_n_children (cast(GtkTreeStore*)modelHandle, null);
     if (count is 0 || start >= count) return;
     start = Math.max (0, start);
     end = Math.min (end, count - 1);
     selectFocusIndex (start);
-    if ((style & SWT.MULTI) !is 0) {
+    if ((style & DWT.MULTI) !is 0) {
         select (start, end);
     }
     showSelection ();
@@ -1394,7 +1394,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1404,12 +1404,12 @@
  */
 public void setSelection(int[] indices) {
     checkWidget ();
-    if (indices is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (indices is null) error (DWT.ERROR_NULL_ARGUMENT);
     deselectAll ();
     int length = indices.length;
-    if (length is 0 || ((style & SWT.SINGLE) !is 0 && length > 1)) return;
+    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
     selectFocusIndex (indices [0]);
-    if ((style & SWT.MULTI) !is 0) {
+    if ((style & DWT.MULTI) !is 0) {
         select (indices);
     }
     showSelection ();
@@ -1428,7 +1428,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the array of items is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1439,17 +1439,17 @@
  */
 public void setSelection (char[] [] items) {
     checkWidget ();
-    if (items is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (items is null) error (DWT.ERROR_NULL_ARGUMENT);
     deselectAll ();
     int length = items.length;
-    if (length is 0 || ((style & SWT.SINGLE) !is 0 && length > 1)) return;
+    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
     bool first = true;
     for (int i = 0; i < length; i++) {
         int index = 0;
         char[] string = items [i];
         if (string !is null) {
             while ((index = indexOf (string, index)) !is -1) {
-                if ((style & SWT.MULTI) !is 0) {
+                if ((style & DWT.MULTI) !is 0) {
                     if (first) {
                         first = false;
                         selectFocusIndex (index);
@@ -1474,7 +1474,7 @@
  *
  * @param index the index of the top item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1511,7 +1511,7 @@
  * this method simply returns.  Otherwise, the items are scrolled until
  * the selection is visible.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/Listener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Listener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,7 +15,7 @@
 /**
  * Implementers of <code>Listener</code> provide a simple
  * <code>handleEvent()</code> method that is used internally
- * by SWT to dispatch events.
+ * by DWT to dispatch events.
  * <p>
  * After creating an instance of a class that implements this interface
  * it can be added to a widget using the
@@ -26,14 +26,14 @@
  * be sent to the instance.
  * </p>
  * <p>
- * Classes which implement this interface are described within SWT as
+ * Classes which implement this interface are described within DWT as
  * providing the <em>untyped listener</em> API. Typically, widgets will
  * also provide a higher-level <em>typed listener</em> API, that is based
  * on the standard <code>java.util.EventListener</code> pattern.
  * </p>
  * <p>
- * Note that, since all internal SWT event dispatching is based on untyped
- * listeners, it is simple to build subsets of SWT for use on memory
+ * Note that, since all internal DWT event dispatching is based on untyped
+ * listeners, it is simple to build subsets of DWT for use on memory
  * constrained, small footprint devices, by removing the classes and
  * methods which implement the typed listener API.
  * </p>
--- a/dwt/widgets/Menu.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Menu.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.widgets.Menu;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.events.MenuListener;
 import dwt.events.HelpListener;
@@ -64,17 +64,17 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#POP_UP
+ * @see DWT#POP_UP
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
 public this (Control parent) {
-    this (checkNull (parent).menuShell (), SWT.POP_UP);
+    this (checkNull (parent).menuShell (), DWT.POP_UP);
 }
 
 /**
@@ -83,10 +83,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -97,14 +97,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#BAR
- * @see SWT#DROP_DOWN
- * @see SWT#POP_UP
+ * @see DWT#BAR
+ * @see DWT#DROP_DOWN
+ * @see DWT#POP_UP
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -125,17 +125,17 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#DROP_DOWN
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
 public this (Menu parentMenu) {
-    this (checkNull (parentMenu).parent, SWT.DROP_DOWN);
+    this (checkNull (parentMenu).parent, DWT.DROP_DOWN);
 }
 
 /**
@@ -149,12 +149,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT#DROP_DOWN
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -163,28 +163,28 @@
 }
 
 static Control checkNull (Control control) {
-    if (control is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (control is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     return control;
 }
 
 static Menu checkNull (Menu menu) {
-    if (menu is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (menu is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     return menu;
 }
 
 static MenuItem checkNull (MenuItem item) {
-    if (item is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (item is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     return item;
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.POP_UP, SWT.BAR, SWT.DROP_DOWN, 0, 0, 0);
+    return checkBits (style, DWT.POP_UP, DWT.BAR, DWT.DROP_DOWN, 0, 0, 0);
 }
 
 void _setVisible (bool visible) {
     if (visible is OS.GTK_WIDGET_MAPPED (handle)) return;
     if (visible) {
-        sendEvent (SWT.Show);
+        sendEvent (DWT.Show);
         if (getItemCount () !is 0) {
             if ((OS.GTK_VERSION >=  OS.buildVERSION (2, 8, 0))) {
                 OS.gtk_menu_shell_set_take_focus (cast(GtkMenuShell*)handle, false);
@@ -197,7 +197,7 @@
             */
             getDisplay().doMenuPositionProc( cast(GtkMenu*)handle, hasLocation );
         } else {
-            sendEvent (SWT.Hide);
+            sendEvent (DWT.Hide);
         }
     } else {
         OS.gtk_menu_popdown (cast(GtkMenu*)handle);
@@ -223,7 +223,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -233,10 +233,10 @@
  */
 public void addMenuListener (MenuListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Hide,typedListener);
-    addListener (SWT.Show,typedListener);
+    addListener (DWT.Hide,typedListener);
+    addListener (DWT.Show,typedListener);
 }
 
 /**
@@ -250,7 +250,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -260,22 +260,22 @@
  */
 public void addHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Help, typedListener);
+    addListener (DWT.Help, typedListener);
 }
 
 void createHandle (int index) {
     state |= HANDLE;
-    if ((style & SWT.BAR) !is 0) {
+    if ((style & DWT.BAR) !is 0) {
         handle = OS.gtk_menu_bar_new ();
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
         auto vboxHandle = parent.vboxHandle;
         OS.gtk_container_add (cast(GtkContainer*)vboxHandle, handle);
         OS.gtk_box_set_child_packing (cast(GtkBox*)vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
     } else {
         handle = OS.gtk_menu_new ();
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
     }
 }
 
@@ -299,7 +299,7 @@
         OS.gtk_menu_shell_insert (cast(GtkMenuShell*)handle, imSeparator, -1);
     }
     if (imItem is null) {
-        char* buffer = toStringz( SWT.getMessage("SWT_InputMethods"));
+        char* buffer = toStringz( DWT.getMessage("SWT_InputMethods"));
         imItem = OS.gtk_image_menu_item_new_with_label (buffer);
         OS.gtk_widget_show (imItem);
         OS.gtk_menu_shell_insert (cast(GtkMenuShell*)handle, imItem, -1);
@@ -347,7 +347,7 @@
  * @return the default menu item.
  *
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -365,7 +365,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -387,7 +387,7 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -395,14 +395,14 @@
 public MenuItem getItem (int index) {
     checkWidget();
     auto list = OS.gtk_container_get_children (cast(GtkContainer*)handle);
-    if (list is null) error (SWT.ERROR_CANNOT_GET_ITEM);
+    if (list is null) error (DWT.ERROR_CANNOT_GET_ITEM);
     int count = OS.g_list_length (list);
     if (imSeparator !is null) count--;
     if (imItem !is null) count--;
-    if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= index && index < count)) error (DWT.ERROR_INVALID_RANGE);
     auto data = cast(GtkWidget*)OS.g_list_nth_data (list, index);
     OS.g_list_free (list);
-    if (data is null) error (SWT.ERROR_CANNOT_GET_ITEM);
+    if (data is null) error (DWT.ERROR_CANNOT_GET_ITEM);
     return cast(MenuItem) display.getWidget (data);
 }
 
@@ -411,7 +411,7 @@
  *
  * @return the number of items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -438,7 +438,7 @@
  *
  * @return the items in the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -484,7 +484,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -501,7 +501,7 @@
  *
  * @return the receiver's parent item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -518,7 +518,7 @@
  *
  * @return the receiver's parent item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -537,7 +537,7 @@
  *
  * @return the receiver's shell
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -561,14 +561,14 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool getVisible () {
     checkWidget();
-    if ((style & SWT.POP_UP) !is 0) {
+    if ((style & DWT.POP_UP) !is 0) {
         Menu [] popups = display.popups;
         if (popups !is null) {
             for (int i=0; i<popups.length; i++) {
@@ -580,11 +580,11 @@
 }
 
 override int /*long*/ gtk_hide (GtkWidget* widget) {
-    if ((style & SWT.POP_UP) !is 0) {
+    if ((style & DWT.POP_UP) !is 0) {
         display.activeShell = getShell ();
     }
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 6, 0)) {
-        sendEvent (SWT.Hide);
+        sendEvent (DWT.Hide);
     } else {
         /*
         * Bug in GTK.  In GTK 2.4 and earlier
@@ -593,17 +593,17 @@
         * workaroud is to post the event instead
         * of send it on these platforms
         */
-        postEvent (SWT.Hide);
+        postEvent (DWT.Hide);
     }
     return 0;
 }
 
 override int /*long*/ gtk_show (GtkWidget* widget) {
-    if ((style & SWT.POP_UP) !is 0) {
+    if ((style & DWT.POP_UP) !is 0) {
         display.activeShell = getShell ();
         return 0;
     }
-    sendEvent (SWT.Show);
+    sendEvent (DWT.Show);
     return 0;
 }
 
@@ -635,14 +635,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the item is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (MenuItem item) {
     checkWidget();
-    if (item is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (item is null) error (DWT.ERROR_NULL_ARGUMENT);
     MenuItem [] items = getItems ();
     for (int i=0; i<items.length; i++) {
         if (items [i] is item) return i;
@@ -658,7 +658,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -681,7 +681,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -712,7 +712,7 @@
     }
     int screenWidth = OS.gdk_screen_width ();
     int reqx = this.x;
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (reqx - requisition.width >= 0) reqx -= requisition.width;
     } else {
         if (reqx + requisition.width > screenWidth) reqx -= requisition.width;
@@ -736,10 +736,10 @@
 void releaseParent () {
     super.releaseParent ();
     if (cascade !is null) cascade.setMenu (null);
-    if ((style & SWT.BAR) !is 0 && this is parent.menuBar) {
+    if ((style & DWT.BAR) !is 0 && this is parent.menuBar) {
         parent.setMenuBar (null);
     }  else {
-        if ((style & SWT.POP_UP) !is 0) {
+        if ((style & DWT.POP_UP) !is 0) {
             display.removePopup (this);
         }
     }
@@ -766,7 +766,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -776,10 +776,10 @@
  */
 public void removeMenuListener (MenuListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Hide, listener);
-    eventTable.unhook (SWT.Show, listener);
+    eventTable.unhook (DWT.Hide, listener);
+    eventTable.unhook (DWT.Show, listener);
 }
 
 void removeAccelerators (GtkAccelGroup* accelGroup) {
@@ -799,7 +799,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -809,20 +809,20 @@
  */
 public void removeHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Help, listener);
+    eventTable.unhook (DWT.Help, listener);
 }
 
 bool sendHelpEvent (int /*long*/ helpType) {
     if (selectedItem !is null && !selectedItem.isDisposed()) {
-        if (selectedItem.hooks (SWT.Help)) {
-            selectedItem.postEvent (SWT.Help);
+        if (selectedItem.hooks (DWT.Help)) {
+            selectedItem.postEvent (DWT.Help);
             return true;
         }
     }
-    if (hooks (SWT.Help)) {
-        postEvent (SWT.Help);
+    if (hooks (DWT.Help)) {
+        postEvent (DWT.Help);
         return true;
     }
     return parent.sendHelpEvent (helpType);
@@ -837,7 +837,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the menu item has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -854,7 +854,7 @@
  *
  * @param enabled the new enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -883,14 +883,14 @@
  * @param x the new x coordinate for the receiver
  * @param y the new y coordinate for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if ((style & (SWT.BAR | SWT.DROP_DOWN)) !is 0) return;
+    if ((style & (DWT.BAR | DWT.DROP_DOWN)) !is 0) return;
     this.x = x;
     this.y = y;
     hasLocation = true;
@@ -913,7 +913,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -922,12 +922,12 @@
  */
 public void setLocation (Point location) {
     checkWidget();
-    if (location is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (location is null) error (DWT.ERROR_NULL_ARGUMENT);
     setLocation (location.x, location.y);
 }
 
 void setOrientation() {
-    if ((parent.style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((parent.style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (handle !is null) OS.gtk_widget_set_direction (handle, OS.GTK_TEXT_DIR_RTL);
     }
 }
@@ -943,14 +943,14 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (bool visible) {
     checkWidget();
-    if ((style & (SWT.BAR | SWT.DROP_DOWN)) !is 0) return;
+    if ((style & (DWT.BAR | DWT.DROP_DOWN)) !is 0) return;
     if (visible) {
         display.addPopup (this);
     } else {
--- a/dwt/widgets/MenuItem.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/MenuItem.d	Tue Jan 15 06:44:34 2008 +0100
@@ -17,7 +17,7 @@
 import dwt.graphics.Rectangle;
 import dwt.graphics.Image;
 import dwt.widgets.ImageList;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.events.ArmListener;
 import dwt.events.HelpListener;
@@ -58,10 +58,10 @@
  * to the end of the items maintained by its parent.
  * <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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -72,16 +72,16 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#CHECK
- * @see SWT#CASCADE
- * @see SWT#PUSH
- * @see SWT#RADIO
- * @see SWT#SEPARATOR
+ * @see DWT#CHECK
+ * @see DWT#CASCADE
+ * @see DWT#PUSH
+ * @see DWT#RADIO
+ * @see DWT#SEPARATOR
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -98,10 +98,10 @@
  * at which to place it in the items maintained by its parent.
  * <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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -114,16 +114,16 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the parent (inclusive)</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#CHECK
- * @see SWT#CASCADE
- * @see SWT#PUSH
- * @see SWT#RADIO
- * @see SWT#SEPARATOR
+ * @see DWT#CHECK
+ * @see DWT#CASCADE
+ * @see DWT#PUSH
+ * @see DWT#RADIO
+ * @see DWT#SEPARATOR
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -132,7 +132,7 @@
     this.parent = parent;
     int count = parent.getItemCount ();
     if (!(0 <= index && index <= count)) {
-        error (SWT.ERROR_INVALID_RANGE);
+        error (DWT.ERROR_INVALID_RANGE);
     }
     createWidget (index);
 }
@@ -157,7 +157,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -167,9 +167,9 @@
  */
 public void addArmListener (ArmListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Arm, typedListener);
+    addListener (DWT.Arm, typedListener);
 }
 
 /**
@@ -183,7 +183,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -193,9 +193,9 @@
  */
 public void addHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Help, typedListener);
+    addListener (DWT.Help, typedListener);
 }
 
 /**
@@ -213,7 +213,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -224,29 +224,29 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener(listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.PUSH, SWT.CHECK, SWT.RADIO, SWT.SEPARATOR, SWT.CASCADE, 0);
+    return checkBits (style, DWT.PUSH, DWT.CHECK, DWT.RADIO, DWT.SEPARATOR, DWT.CASCADE, 0);
 }
 
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 void createHandle (int index) {
     state |= HANDLE;
     char [] buffer = "\0";
-    int bits = SWT.CHECK | SWT.RADIO | SWT.PUSH | SWT.SEPARATOR;
+    int bits = DWT.CHECK | DWT.RADIO | DWT.PUSH | DWT.SEPARATOR;
     switch (style & bits) {
-        case SWT.SEPARATOR:
+        case DWT.SEPARATOR:
             handle = OS.gtk_separator_menu_item_new ();
             break;
-        case SWT.RADIO:
+        case DWT.RADIO:
             /*
             * Feature in GTK.  In GTK, radio button must always be part of
             * a radio button group.  In a GTK radio group, one button is always
@@ -259,22 +259,22 @@
             * unselected.
             */
             groupHandle = cast(GtkAccelGroup*) OS.gtk_radio_menu_item_new (null);
-            if (groupHandle is null) error (SWT.ERROR_NO_HANDLES);
+            if (groupHandle is null) error (DWT.ERROR_NO_HANDLES);
             OS.g_object_ref (groupHandle);
             OS.gtk_object_sink (cast(GtkObject*)groupHandle);
             auto group = OS.gtk_radio_menu_item_get_group (cast(GtkRadioMenuItem*) groupHandle);
             handle = OS.gtk_radio_menu_item_new_with_label (group, buffer.ptr);
             break;
-        case SWT.CHECK:
+        case DWT.CHECK:
             handle = OS.gtk_check_menu_item_new_with_label (buffer.ptr);
             break;
-        case SWT.PUSH:
+        case DWT.PUSH:
         default:
             handle = OS.gtk_image_menu_item_new_with_label (buffer.ptr);
             break;
     }
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
-    if ((style & SWT.SEPARATOR) is 0) {
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
+    if ((style & DWT.SEPARATOR) is 0) {
         auto label = OS.gtk_bin_get_child (cast(GtkBin*)handle);
         OS.gtk_accel_label_set_accel_widget (cast(GtkAccelLabel*)label, null);
     }
@@ -293,14 +293,14 @@
 /**
  * Returns the widget accelerator.  An accelerator is the bit-wise
  * OR of zero or more modifier masks and a key. Examples:
- * <code>SWT.CONTROL | SWT.SHIFT | 'T', SWT.ALT | SWT.F2</code>.
+ * <code>DWT.CONTROL | DWT.SHIFT | 'T', DWT.ALT | DWT.F2</code>.
  * The default value is zero, indicating that the menu item does
  * not have an accelerator.
  *
  * @return the accelerator or 0
  *
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -340,7 +340,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -361,7 +361,7 @@
  *
  * @return the receiver's menu
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -376,7 +376,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -395,19 +395,19 @@
  *
  * @return the selection state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool getSelection () {
     checkWidget();
-    if ((style & (SWT.CHECK | SWT.RADIO)) is 0) return false;
+    if ((style & (DWT.CHECK | DWT.RADIO)) is 0) return false;
     return cast(bool)OS.gtk_check_menu_item_get_active(cast(GtkCheckMenuItem*)handle);
 }
 
 override int /*long*/ gtk_activate (GtkWidget* widget) {
-    if ((style & SWT.CASCADE) !is 0 && menu !is null) return 0;
+    if ((style & DWT.CASCADE) !is 0 && menu !is null) return 0;
     /*
     * Bug in GTK.  When an ancestor menu is disabled and
     * the user types an accelerator key, GTK delivers the
@@ -435,25 +435,25 @@
         }
         OS.gdk_event_free (ptr);
     }
-    if ((style & SWT.RADIO) !is 0) {
-        if ((parent.getStyle () & SWT.NO_RADIO_GROUP) is 0) {
+    if ((style & DWT.RADIO) !is 0) {
+        if ((parent.getStyle () & DWT.NO_RADIO_GROUP) is 0) {
             selectRadio ();
         }
     }
-    postEvent (SWT.Selection, event);
+    postEvent (DWT.Selection, event);
     return 0;
 }
 
 override int /*long*/ gtk_select (int /*long*/ item) {
     parent.selectedItem = this;
-    sendEvent (SWT.Arm);
+    sendEvent (DWT.Arm);
     return 0;
 }
 
 override int /*long*/ gtk_show_help (GtkWidget* widget, int /*long*/ helpType) {
-    bool handled = hooks (SWT.Help);
+    bool handled = hooks (DWT.Help);
     if (handled) {
-        postEvent (SWT.Help);
+        postEvent (DWT.Help);
     } else {
         handled = parent.sendHelpEvent (helpType);
     }
@@ -479,7 +479,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -535,7 +535,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -545,9 +545,9 @@
  */
 public void removeArmListener (ArmListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Arm, listener);
+    eventTable.unhook (DWT.Arm, listener);
 }
 
 /**
@@ -559,7 +559,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -569,9 +569,9 @@
  */
 public void removeHelpListener (HelpListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Help, listener);
+    eventTable.unhook (DWT.Help, listener);
 }
 
 /**
@@ -583,7 +583,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -593,10 +593,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 void selectRadio () {
     int index = 0;
@@ -611,15 +611,15 @@
 /**
  * Sets the widget accelerator.  An accelerator is the bit-wise
  * OR of zero or more modifier masks and a key. Examples:
- * <code>SWT.MOD1 | SWT.MOD2 | 'T', SWT.MOD3 | SWT.F2</code>.
- * <code>SWT.CONTROL | SWT.SHIFT | 'T', SWT.ALT | SWT.F2</code>.
+ * <code>DWT.MOD1 | DWT.MOD2 | 'T', DWT.MOD3 | DWT.F2</code>.
+ * <code>DWT.CONTROL | DWT.SHIFT | 'T', DWT.ALT | DWT.F2</code>.
  * The default value is zero, indicating that the menu item does
  * not have an accelerator.
  *
  * @param accelerator an integer that is the bit-wise OR of masks and a key
  *
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -641,7 +641,7 @@
  *
  * @param enabled the new enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -664,14 +664,14 @@
  *
  * @param image the image to display
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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();
-    if ((style & SWT.SEPARATOR) !is 0) return;
+    if ((style & DWT.SEPARATOR) !is 0) return;
     super.setImage (image);
     if (!OS.GTK_IS_IMAGE_MENU_ITEM (cast(GTypeInstance*)handle)) return;
     if (image !is null) {
@@ -712,7 +712,7 @@
  *    <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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -721,15 +721,15 @@
     checkWidget ();
 
     /* Check to make sure the new menu is valid */
-    if ((style & SWT.CASCADE) is 0) {
-        error (SWT.ERROR_MENUITEM_NOT_CASCADE);
+    if ((style & DWT.CASCADE) is 0) {
+        error (DWT.ERROR_MENUITEM_NOT_CASCADE);
     }
     if (menu !is null) {
-        if ((menu.style & SWT.DROP_DOWN) is 0) {
-            error (SWT.ERROR_MENU_NOT_DROP_DOWN);
+        if ((menu.style & DWT.DROP_DOWN) is 0) {
+            error (DWT.ERROR_MENU_NOT_DROP_DOWN);
         }
         if (menu.parent !is parent.parent) {
-            error (SWT.ERROR_INVALID_PARENT);
+            error (DWT.ERROR_INVALID_PARENT);
         }
     }
 
@@ -755,7 +755,7 @@
 }
 
 void setOrientation() {
-    if ((parent.style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((parent.style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (handle !is null) {
             OS.gtk_widget_set_direction (handle, OS.GTK_TEXT_DIR_RTL);
             OS.gtk_container_forall (cast(GtkContainer*)handle, cast(GtkCallback)&Display.setDirectionProcFunc, cast(void*)OS.GTK_TEXT_DIR_RTL);
@@ -764,10 +764,10 @@
 }
 
 bool setRadioSelection (bool value) {
-    if ((style & SWT.RADIO) is 0) return false;
+    if ((style & DWT.RADIO) is 0) return false;
     if (getSelection () !is value) {
         setSelection (value);
-        postEvent (SWT.Selection);
+        postEvent (DWT.Selection);
     }
     return true;
 }
@@ -780,17 +780,17 @@
  *
  * @param selected the new selection state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (bool selected) {
     checkWidget();
-    if ((style & (SWT.CHECK | SWT.RADIO)) is 0) return;
+    if ((style & (DWT.CHECK | DWT.RADIO)) is 0) return;
     OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)ACTIVATE);
     OS.gtk_check_menu_item_set_active (cast(GtkCheckMenuItem*)handle, selected);
-    if ((style & SWT.RADIO) !is 0) OS.gtk_check_menu_item_set_active (cast(GtkCheckMenuItem*)groupHandle, !selected);
+    if ((style & DWT.RADIO) !is 0) OS.gtk_check_menu_item_set_active (cast(GtkCheckMenuItem*)groupHandle, !selected);
     OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)ACTIVATE);
 }
 
@@ -824,7 +824,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -833,8 +833,8 @@
  */
 public void setText (char[] string) {
     checkWidget();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.SEPARATOR) !is 0) return;
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.SEPARATOR) !is 0) return;
     if (text ==/*eq*/ string) return;
     super.setText (string);
     char[] accelString = "";
@@ -861,10 +861,10 @@
 void updateAccelerator (GtkAccelGroup* accelGroup, bool add) {
     if (accelerator is 0 || !getEnabled ()) return;
     int mask = 0;
-    if ((accelerator & SWT.ALT) !is 0) mask |= OS.GDK_MOD1_MASK;
-    if ((accelerator & SWT.SHIFT) !is 0) mask |= OS.GDK_SHIFT_MASK;
-    if ((accelerator & SWT.CONTROL) !is 0) mask |= OS.GDK_CONTROL_MASK;
-    int keysym = accelerator & SWT.KEY_MASK;
+    if ((accelerator & DWT.ALT) !is 0) mask |= OS.GDK_MOD1_MASK;
+    if ((accelerator & DWT.SHIFT) !is 0) mask |= OS.GDK_SHIFT_MASK;
+    if ((accelerator & DWT.CONTROL) !is 0) mask |= OS.GDK_CONTROL_MASK;
+    int keysym = accelerator & DWT.KEY_MASK;
     int newKey = Display.untranslateKey (keysym);
     if (newKey !is 0) {
         keysym = newKey;
--- a/dwt/widgets/Scale.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Scale.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -14,7 +14,7 @@
 import dwt.widgets.Control;
 import dwt.widgets.Composite;
 import dwt.widgets.TypedListener;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.events.SelectionListener;
@@ -34,7 +34,7 @@
  * </p><p>
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  */
 public class Scale : Control {
@@ -44,10 +44,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -58,13 +58,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#HORIZONTAL
- * @see SWT#VERTICAL
+ * @see DWT#HORIZONTAL
+ * @see DWT#VERTICAL
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -87,7 +87,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -97,25 +97,25 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
+    return checkBits (style, DWT.HORIZONTAL, DWT.VERTICAL, 0, 0, 0, 0);
 }
 
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     Point size = computeNativeSize(handle, wHint, hHint, changed);
-    if ((style & SWT.HORIZONTAL) !is 0) {
-        if (wHint is SWT.DEFAULT) size.x = 2 * size.x;
+    if ((style & DWT.HORIZONTAL) !is 0) {
+        if (wHint is DWT.DEFAULT) size.x = 2 * size.x;
     } else {
-        if (hHint is SWT.DEFAULT) size.y = 2 * size.y;
+        if (hHint is DWT.DEFAULT) size.y = 2 * size.y;
     }
     return size;
 }
@@ -123,16 +123,16 @@
 void createHandle (int index) {
     state |= HANDLE | THEME_BACKGROUND;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     auto hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
-    if (hAdjustment is null) error (SWT.ERROR_NO_HANDLES);
-    if ((style & SWT.HORIZONTAL) !is 0) {
+    if (hAdjustment is null) error (DWT.ERROR_NO_HANDLES);
+    if ((style & DWT.HORIZONTAL) !is 0) {
         handle = cast(GtkWidget*)OS.gtk_hscale_new (cast(GtkAdjustment*)hAdjustment);
     } else {
         handle = cast(GtkWidget*)OS.gtk_vscale_new (cast(GtkAdjustment*)hAdjustment);
     }
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
     OS.gtk_scale_set_digits (cast(GtkScale*)handle, 0);
     OS.gtk_scale_set_draw_value (cast(GtkScale*)handle, false);
@@ -150,7 +150,7 @@
  *
  * @return the increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -166,7 +166,7 @@
  *
  * @return the maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -182,7 +182,7 @@
  *
  * @return the minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -200,7 +200,7 @@
  *
  * @return the page increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -216,7 +216,7 @@
  *
  * @return the selection
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -228,7 +228,7 @@
 }
 
 int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
-    postEvent (SWT.Selection);
+    postEvent (DWT.Selection);
     return 0;
 }
 
@@ -241,7 +241,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -251,10 +251,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 /**
@@ -265,7 +265,7 @@
  *
  * @param increment the new increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -286,7 +286,7 @@
  *
  * @param value the new maximum, which must be greater than the current minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -308,7 +308,7 @@
  *
  * @param value the new minimum, which must be nonnegative and less than the current maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -331,7 +331,7 @@
  *
  * @param pageIncrement the page increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -350,7 +350,7 @@
  *
  * @param value the new selection (must be zero or greater)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/ScrollBar.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/ScrollBar.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,7 +12,7 @@
 
 import dwt.widgets.Control;
 import dwt.widgets.Scrollable;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.graphics.Point;
 import dwt.internal.gtk.OS;
 import dwt.events.SelectionListener;
@@ -54,7 +54,7 @@
  * maximum and minimum values). Typically, this is used to
  * indicate some proportional value such as the ratio of the
  * visible area of a document to the total amount of space that
- * it would take to display it. SWT supports setting the thumb
+ * it would take to display it. DWT supports setting the thumb
  * size even if the underlying platform does not, but in this
  * case the appearance of the scroll bar will not change.
  * </p><p>
@@ -112,14 +112,14 @@
  * interface.
  * <p>
  * When <code>widgetSelected</code> is called, the event object detail field contains one of the following values:
- * <code>SWT.NONE</code> - for the end of a drag.
- * <code>SWT.DRAG</code>.
- * <code>SWT.HOME</code>.
- * <code>SWT.END</code>.
- * <code>SWT.ARROW_DOWN</code>.
- * <code>SWT.ARROW_UP</code>.
- * <code>SWT.PAGE_DOWN</code>.
- * <code>SWT.PAGE_UP</code>.
+ * <code>DWT.NONE</code> - for the end of a drag.
+ * <code>DWT.DRAG</code>.
+ * <code>DWT.HOME</code>.
+ * <code>DWT.END</code>.
+ * <code>DWT.ARROW_DOWN</code>.
+ * <code>DWT.ARROW_UP</code>.
+ * <code>DWT.PAGE_DOWN</code>.
+ * <code>DWT.PAGE_UP</code>.
  * <code>widgetDefaultSelected</code> is not called.
  * </p>
  *
@@ -128,7 +128,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -139,14 +139,14 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
+    return checkBits (style, DWT.HORIZONTAL, DWT.VERTICAL, 0, 0, 0, 0);
 }
 
 void deregister () {
@@ -162,7 +162,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -182,7 +182,7 @@
  *
  * @return the increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -197,7 +197,7 @@
  *
  * @return the maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -212,7 +212,7 @@
  *
  * @return the minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -229,7 +229,7 @@
  *
  * @return the page increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -244,7 +244,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -259,7 +259,7 @@
  *
  * @return the selection
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -277,7 +277,7 @@
  *
  * @return the receiver's size
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -296,7 +296,7 @@
  *
  * @return the thumb value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -320,7 +320,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -330,7 +330,7 @@
     auto scrolledHandle = parent.scrolledHandle;
     int hsp, vsp;
     OS.gtk_scrolled_window_get_policy (cast(GtkScrolledWindow*)scrolledHandle, &hsp, &vsp);
-    if ((style & SWT.HORIZONTAL) !is 0) {
+    if ((style & DWT.HORIZONTAL) !is 0) {
         return hsp !is OS.GTK_POLICY_NEVER;
     } else {
         return vsp !is OS.GTK_POLICY_NEVER;
@@ -354,27 +354,27 @@
     Event event = new Event ();
     dragSent = detail is OS.GTK_SCROLL_JUMP;
     switch (detail) {
-        case OS.GTK_SCROLL_NONE:            event.detail = SWT.NONE; break;
-        case OS.GTK_SCROLL_JUMP:            event.detail = SWT.DRAG; break;
-        case OS.GTK_SCROLL_START:           event.detail = SWT.HOME; break;
-        case OS.GTK_SCROLL_END:             event.detail = SWT.END; break;
+        case OS.GTK_SCROLL_NONE:            event.detail = DWT.NONE; break;
+        case OS.GTK_SCROLL_JUMP:            event.detail = DWT.DRAG; break;
+        case OS.GTK_SCROLL_START:           event.detail = DWT.HOME; break;
+        case OS.GTK_SCROLL_END:             event.detail = DWT.END; break;
         case OS.GTK_SCROLL_PAGE_DOWN:
         case OS.GTK_SCROLL_PAGE_RIGHT:
-        case OS.GTK_SCROLL_PAGE_FORWARD:    event.detail = SWT.PAGE_DOWN; break;
+        case OS.GTK_SCROLL_PAGE_FORWARD:    event.detail = DWT.PAGE_DOWN; break;
         case OS.GTK_SCROLL_PAGE_UP:
         case OS.GTK_SCROLL_PAGE_LEFT:
-        case OS.GTK_SCROLL_PAGE_BACKWARD:   event.detail = SWT.PAGE_UP; break;
+        case OS.GTK_SCROLL_PAGE_BACKWARD:   event.detail = DWT.PAGE_UP; break;
         case OS.GTK_SCROLL_STEP_DOWN:
         case OS.GTK_SCROLL_STEP_RIGHT:
-        case OS.GTK_SCROLL_STEP_FORWARD:    event.detail = SWT.ARROW_DOWN; break;
+        case OS.GTK_SCROLL_STEP_FORWARD:    event.detail = DWT.ARROW_DOWN; break;
         case OS.GTK_SCROLL_STEP_UP:
         case OS.GTK_SCROLL_STEP_LEFT:
-        case OS.GTK_SCROLL_STEP_BACKWARD:   event.detail = SWT.ARROW_UP; break;
+        case OS.GTK_SCROLL_STEP_BACKWARD:   event.detail = DWT.ARROW_UP; break;
         default:
     }
     detail = OS.GTK_SCROLL_NONE;
     if (!dragSent) detail = OS.GTK_SCROLL_NONE;
-    postEvent (SWT.Selection, event);
+    postEvent (DWT.Selection, event);
     parent.updateScrollBarValue (this);
     return 0;
 }
@@ -383,13 +383,13 @@
     switch (gdkEvent.type) {
         case OS.GDK_BUTTON_RELEASE: {
             GdkEventButton* gdkEventButton = cast(GdkEventButton*)gdkEvent;
-            if (gdkEventButton.button is 1 && detail is SWT.DRAG) {
+            if (gdkEventButton.button is 1 && detail is DWT.DRAG) {
                 if (!dragSent) {
                     Event event = new Event ();
-                    event.detail = SWT.DRAG;
-                    postEvent (SWT.Selection, event);
+                    event.detail = DWT.DRAG;
+                    postEvent (DWT.Selection, event);
                 }
-                postEvent (SWT.Selection);
+                postEvent (DWT.Selection);
             }
             detail = OS.GTK_SCROLL_NONE;
             dragSent = false;
@@ -418,7 +418,7 @@
  *
  * @return the receiver's enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -437,7 +437,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -474,7 +474,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -484,10 +484,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 /**
@@ -498,7 +498,7 @@
  *
  * @param enabled the new enabled state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -516,7 +516,7 @@
  *
  * @param value the new increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -538,7 +538,7 @@
  *
  * @param value the new maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -563,7 +563,7 @@
  *
  * @param value the new minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -589,7 +589,7 @@
  *
  * @param value the page increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -610,7 +610,7 @@
  *
  * @param selection the new selection (must be zero or greater)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -632,7 +632,7 @@
  * @param value the new thumb value, which must be at least one and not
  * larger than the size of the current range
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -664,7 +664,7 @@
  * @param increment the new increment value
  * @param pageIncrement the new pageIncrement value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -700,7 +700,7 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/Scrollable.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Scrollable.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,7 +11,7 @@
 module dwt.widgets.Scrollable;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Rectangle;
 import dwt.widgets.Composite;
@@ -34,7 +34,7 @@
  * </dl>
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  */
 public abstract class Scrollable : Control {
@@ -51,10 +51,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -65,13 +65,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#H_SCROLL
- * @see SWT#V_SCROLL
+ * @see DWT#H_SCROLL
+ * @see DWT#V_SCROLL
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -103,7 +103,7 @@
  * @param height the desired height of the client area
  * @return the required bounds to produce the given client area
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -140,7 +140,7 @@
     bar.style = style;
     bar.display = display;
     bar.state |= HANDLE;
-    if ((style & SWT.H_SCROLL) !is 0) {
+    if ((style & DWT.H_SCROLL) !is 0) {
         bar.handle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (cast(GtkScrolledWindow*)scrolledHandle);
         bar.adjustmentHandle = OS.gtk_scrolled_window_get_hadjustment (cast(GtkScrolledWindow*)scrolledHandle);
     } else {
@@ -154,8 +154,8 @@
 
 override void createWidget (int index) {
     super.createWidget (index);
-    if ((style & SWT.H_SCROLL) !is 0) horizontalBar = createScrollBar (SWT.H_SCROLL);
-    if ((style & SWT.V_SCROLL) !is 0) verticalBar = createScrollBar (SWT.V_SCROLL);
+    if ((style & DWT.H_SCROLL) !is 0) horizontalBar = createScrollBar (DWT.H_SCROLL);
+    if ((style & DWT.V_SCROLL) !is 0) verticalBar = createScrollBar (DWT.V_SCROLL);
 }
 
 override void deregister () {
@@ -183,7 +183,7 @@
  *
  * @return the client area
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -206,7 +206,7 @@
  *
  * @return the horizontal scroll bar (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -221,7 +221,7 @@
  *
  * @return the vertical scroll bar (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -280,7 +280,7 @@
 
 override void setOrientation () {
     super.setOrientation ();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
         if (scrolledHandle !is null) {
             OS.gtk_widget_set_direction (cast(GtkWidget*)scrolledHandle, OS.GTK_TEXT_DIR_RTL);
         }
@@ -292,7 +292,7 @@
     int hsp, vsp;
     OS.gtk_scrolled_window_get_policy (cast(GtkScrolledWindow*)scrolledHandle, &hsp, &vsp);
     int policy = visible ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-    if ((bar.style & SWT.HORIZONTAL) !is 0) {
+    if ((bar.style & DWT.HORIZONTAL) !is 0) {
         if (hsp is policy) return false;
         hsp = policy;
     } else {
@@ -300,8 +300,8 @@
         vsp = policy;
     }
     OS.gtk_scrolled_window_set_policy (cast(GtkScrolledWindow*)scrolledHandle, hsp, vsp);
-    bar.sendEvent (visible ? SWT.Show : SWT.Hide);
-    sendEvent (SWT.Resize);
+    bar.sendEvent (visible ? DWT.Show : DWT.Hide);
+    sendEvent (DWT.Resize);
     return true;
 }
 
--- a/dwt/widgets/Shell.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Shell.d	Tue Jan 15 06:44:34 2008 +0100
@@ -14,7 +14,7 @@
 import dwt.widgets.Control;
 import dwt.internal.c.gtk;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.events.ShellListener;
 import dwt.graphics.Cursor;
@@ -23,7 +23,7 @@
 import dwt.graphics.Rectangle;
 import dwt.graphics.Region;
 import dwt.internal.Converter;
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 import dwt.widgets.Composite;
 import dwt.widgets.Control;
 import dwt.widgets.Decorations;
@@ -109,7 +109,7 @@
  * <dt><b>Events:</b></dt>
  * <dd>Activate, Close, Deactivate, Deiconify, Iconify</dd>
  * </dl>
- * Class <code>SWT</code> provides two "convenience constants"
+ * Class <code>DWT</code> provides two "convenience constants"
  * for the most commonly required style combinations:
  * <dl>
  * <dt><code>SHELL_TRIM</code></dt>
@@ -134,7 +134,7 @@
  * </p>
  *
  * @see Decorations
- * @see SWT
+ * @see DWT
  */
 public class Shell : Decorations {
     GtkWidget* shellHandle, tooltipsHandle, tooltipWindow;
@@ -153,7 +153,7 @@
  * Constructs a new instance of this class. This is equivalent
  * to calling <code>Shell((Display) null)</code>.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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>
@@ -167,34 +167,34 @@
  * to calling <code>Shell((Display) null, style)</code>.
  * <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 <code>DWT</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
+ * of those <code>DWT</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 style the style of control to construct
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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#MODELESS
- * @see SWT#PRIMARY_MODAL
- * @see SWT#APPLICATION_MODAL
- * @see SWT#SYSTEM_MODAL
+ * @see DWT#BORDER
+ * @see DWT#CLOSE
+ * @see DWT#MIN
+ * @see DWT#MAX
+ * @see DWT#RESIZE
+ * @see DWT#TITLE
+ * @see DWT#NO_TRIM
+ * @see DWT#SHELL_TRIM
+ * @see DWT#DIALOG_TRIM
+ * @see DWT#MODELESS
+ * @see DWT#PRIMARY_MODAL
+ * @see DWT#APPLICATION_MODAL
+ * @see DWT#SYSTEM_MODAL
  */
 public this (int style) {
     this (cast(Display) null, style);
@@ -202,25 +202,25 @@
 
 /**
  * Constructs a new instance of this class given only the display
- * to create it on. It is created with style <code>SWT.SHELL_TRIM</code>.
+ * to create it on. It is created with style <code>DWT.SHELL_TRIM</code>.
  * <p>
  * Note: Currently, null can be passed in for the display argument.
  * This has the effect of creating the shell on the currently active
  * display if there is one. If there is no current display, the
  * shell is created on a "default" display. <b>Passing in null as
  * the display argument is not considered to be good coding style,
- * and may not be supported in a future release of SWT.</b>
+ * and may not be supported in a future release of DWT.</b>
  * </p>
  *
  * @param display the display to create the shell on
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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 this (Display display) {
-    this (display, SWT.SHELL_TRIM);
+    this (display, DWT.SHELL_TRIM);
 }
 /**
  * Constructs a new instance of this class given the display
@@ -228,10 +228,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p><p>
@@ -240,30 +240,30 @@
  * display if there is one. If there is no current display, the
  * shell is created on a "default" display. <b>Passing in null as
  * the display argument is not considered to be good coding style,
- * and may not be supported in a future release of SWT.</b>
+ * and may not be supported in a future release of DWT.</b>
  * </p>
  *
  * @param display the display to create the shell on
  * @param style the style of control to construct
  *
- * @exception SWTException <ul>
+ * @exception DWTException <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#MODELESS
- * @see SWT#PRIMARY_MODAL
- * @see SWT#APPLICATION_MODAL
- * @see SWT#SYSTEM_MODAL
+ * @see DWT#BORDER
+ * @see DWT#CLOSE
+ * @see DWT#MIN
+ * @see DWT#MAX
+ * @see DWT#RESIZE
+ * @see DWT#TITLE
+ * @see DWT#NO_TRIM
+ * @see DWT#SHELL_TRIM
+ * @see DWT#DIALOG_TRIM
+ * @see DWT#MODELESS
+ * @see DWT#PRIMARY_MODAL
+ * @see DWT#APPLICATION_MODAL
+ * @see DWT#SYSTEM_MODAL
  */
 public this (Display display, int style) {
     this (display, null, style, null, false);
@@ -275,10 +275,10 @@
     if (display is null) display = Display.getCurrent ();
     if (display is null) display = Display.getDefault ();
     if (!display.isValidThread ()) {
-        error (SWT.ERROR_THREAD_INVALID_ACCESS);
+        error (DWT.ERROR_THREAD_INVALID_ACCESS);
     }
     if (parent !is null && parent.isDisposed ()) {
-        error (SWT.ERROR_INVALID_ARGUMENT);
+        error (DWT.ERROR_INVALID_ARGUMENT);
     }
     this.style = checkStyle (style);
     this.parent = parent;
@@ -296,14 +296,14 @@
 
 /**
  * Constructs a new instance of this class given only its
- * parent. It is created with style <code>SWT.DIALOG_TRIM</code>.
+ * parent. It is created with style <code>DWT.DIALOG_TRIM</code>.
  * <p>
  * Note: Currently, null can be passed in for the parent.
  * This has the effect of creating the shell on the currently active
  * display if there is one. If there is no current display, the
  * shell 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>
+ * and may not be supported in a future release of DWT.</b>
  * </p>
  *
  * @param parent a shell which will be the parent of the new instance
@@ -311,13 +311,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the parent is disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 this (Shell parent) {
-    this (parent, SWT.DIALOG_TRIM);
+    this (parent, DWT.DIALOG_TRIM);
 }
 
 /**
@@ -325,10 +325,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p><p>
@@ -337,7 +337,7 @@
  * display if there is one. If there is no current display, the
  * shell 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>
+ * and may not be supported in a future release of DWT.</b>
  * </p>
  *
  * @param parent a shell which will be the parent of the new instance
@@ -346,47 +346,47 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the parent is disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 SWT#MODELESS
- * @see SWT#PRIMARY_MODAL
- * @see SWT#APPLICATION_MODAL
- * @see SWT#SYSTEM_MODAL
+ * @see DWT#BORDER
+ * @see DWT#CLOSE
+ * @see DWT#MIN
+ * @see DWT#MAX
+ * @see DWT#RESIZE
+ * @see DWT#TITLE
+ * @see DWT#NO_TRIM
+ * @see DWT#SHELL_TRIM
+ * @see DWT#DIALOG_TRIM
+ * @see DWT#ON_TOP
+ * @see DWT#TOOL
+ * @see DWT#MODELESS
+ * @see DWT#PRIMARY_MODAL
+ * @see DWT#APPLICATION_MODAL
+ * @see DWT#SYSTEM_MODAL
  */
 public this (Shell parent, int style) {
     this (parent !is null ? parent.display : null, parent, style, null, false);
 }
 
 public static Shell gtk_new (Display display, GtkWidget* handle) {
-    return new Shell (display, null, SWT.NO_TRIM, handle, true);
+    return new Shell (display, null, DWT.NO_TRIM, handle, true);
 }
 
 public static Shell internal_new (Display display, GtkWidget* handle) {
-    return new Shell (display, null, SWT.NO_TRIM, handle, false);
+    return new Shell (display, null, DWT.NO_TRIM, handle, false);
 }
 
 static int checkStyle (int style) {
     style = Decorations.checkStyle (style);
-    if ((style & SWT.ON_TOP) !is 0) style &= ~SWT.SHELL_TRIM;
-    int mask = SWT.SYSTEM_MODAL | SWT.APPLICATION_MODAL | SWT.PRIMARY_MODAL;
+    if ((style & DWT.ON_TOP) !is 0) style &= ~DWT.SHELL_TRIM;
+    int mask = DWT.SYSTEM_MODAL | DWT.APPLICATION_MODAL | DWT.PRIMARY_MODAL;
     int bits = style & ~mask;
-    if ((style & SWT.SYSTEM_MODAL) !is 0) return bits | SWT.SYSTEM_MODAL;
-    if ((style & SWT.APPLICATION_MODAL) !is 0) return bits | SWT.APPLICATION_MODAL;
-    if ((style & SWT.PRIMARY_MODAL) !is 0) return bits | SWT.PRIMARY_MODAL;
+    if ((style & DWT.SYSTEM_MODAL) !is 0) return bits | DWT.SYSTEM_MODAL;
+    if ((style & DWT.APPLICATION_MODAL) !is 0) return bits | DWT.APPLICATION_MODAL;
+    if ((style & DWT.PRIMARY_MODAL) !is 0) return bits | DWT.PRIMARY_MODAL;
     return bits;
 }
 
@@ -401,7 +401,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -411,13 +411,13 @@
  */
 public void addShellListener (ShellListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Close,typedListener);
-    addListener (SWT.Iconify,typedListener);
-    addListener (SWT.Deiconify,typedListener);
-    addListener (SWT.Activate, typedListener);
-    addListener (SWT.Deactivate, typedListener);
+    addListener (DWT.Close,typedListener);
+    addListener (DWT.Iconify,typedListener);
+    addListener (DWT.Deiconify,typedListener);
+    addListener (DWT.Activate, typedListener);
+    addListener (DWT.Deactivate, typedListener);
 }
 
 void adjustTrim () {
@@ -439,10 +439,10 @@
         return;
     }
     bool hasTitle = false, hasResize = false, hasBorder = false;
-    if ((style & SWT.NO_TRIM) is 0) {
-        hasTitle = (style & (SWT.MIN | SWT.MAX | SWT.TITLE | SWT.MENU)) !is 0;
-        hasResize = (style & SWT.RESIZE) !is 0;
-        hasBorder = (style & SWT.BORDER) !is 0;
+    if ((style & DWT.NO_TRIM) is 0) {
+        hasTitle = (style & (DWT.MIN | DWT.MAX | DWT.TITLE | DWT.MENU)) !is 0;
+        hasResize = (style & DWT.RESIZE) !is 0;
+        hasBorder = (style & DWT.BORDER) !is 0;
     }
     if (hasTitle) {
         if (hasResize)  {
@@ -508,7 +508,7 @@
     * the focus.
     */
     auto window = OS.GTK_WIDGET_WINDOW (shellHandle);
-    if ((xFocus || (style & SWT.ON_TOP) !is 0) && OS.GDK_WINDOWING_X11 ()) {
+    if ((xFocus || (style & DWT.ON_TOP) !is 0) && OS.GDK_WINDOWING_X11 ()) {
         auto xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
         auto xWindow = OS.gdk_x11_drawable_get_xid (window);
         OS.gdk_error_trap_push ();
@@ -551,12 +551,12 @@
  * key or mouse combination that indicates the window
  * should be removed.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT#Close
+ * @see DWT#Close
  * @see #dispose
  */
 public void close () {
@@ -565,7 +565,7 @@
 }
 void closeWidget () {
     Event event = new Event ();
-    sendEvent (SWT.Close, event);
+    sendEvent (DWT.Close, event);
     if (event.doit && !isDisposed ()) dispose ();
 }
 
@@ -573,7 +573,7 @@
     checkWidget();
     Rectangle trim = super.computeTrim (x, y, width, height);
     int border = 0;
-    if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) is 0) {
+    if ((style & (DWT.NO_TRIM | DWT.BORDER | DWT.SHELL_TRIM)) is 0) {
         border = OS.gtk_container_get_border_width (cast(GtkContainer*)shellHandle);
     }
     int trimWidth = trimWidth (), trimHeight = trimHeight ();
@@ -596,12 +596,12 @@
     if (shellHandle is null) {
         if (handle is null) {
             int type = OS.GTK_WINDOW_TOPLEVEL;
-            if ((style & SWT.ON_TOP) !is 0) type = OS.GTK_WINDOW_POPUP;
+            if ((style & DWT.ON_TOP) !is 0) type = OS.GTK_WINDOW_POPUP;
             shellHandle = cast(GtkWidget*)OS.gtk_window_new (type);
         } else {
             shellHandle = cast(GtkWidget*) OS.gtk_plug_new (cast(uint)handle);
         }
-        if (shellHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (shellHandle is null) error (DWT.ERROR_NO_HANDLES);
         if (parent !is null) {
             OS.gtk_window_set_transient_for (cast(GtkWindow*)shellHandle, cast(GtkWindow*)parent.topHandle ());
             OS.gtk_window_set_destroy_with_parent (cast(GtkWindow*)shellHandle, true);
@@ -618,41 +618,41 @@
         * is created or it will not be allowed to be resized smaller that the
         * initial size by the user.  The fix is to set the size to zero.
         */
-        if ((style & SWT.RESIZE) !is 0) {
+        if ((style & DWT.RESIZE) !is 0) {
             OS.gtk_widget_set_size_request (shellHandle, 0, 0);
             OS.gtk_window_set_resizable (cast(GtkWindow*)shellHandle, true);
         } else {
             OS.gtk_window_set_resizable (cast(GtkWindow*)shellHandle, false);
         }
         vboxHandle = OS.gtk_vbox_new (false, 0);
-        if (vboxHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (vboxHandle is null) error (DWT.ERROR_NO_HANDLES);
         createHandle (index, false, true);
         OS.gtk_container_add (cast(GtkContainer*)vboxHandle, scrolledHandle);
         OS.gtk_box_set_child_packing (cast(GtkBox*)vboxHandle, scrolledHandle, true, true, 0, OS.GTK_PACK_END);
         char[] dummy = "a";
         OS.gtk_window_set_title (cast(GtkWindow*)shellHandle, dummy.ptr );
-        if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) is 0) {
+        if ((style & (DWT.NO_TRIM | DWT.BORDER | DWT.SHELL_TRIM)) is 0) {
             OS.gtk_container_set_border_width (cast(GtkContainer*)shellHandle, 1);
             GdkColor* color = new GdkColor ();
             OS.gtk_style_get_black (OS.gtk_widget_get_style (shellHandle), color);
             OS.gtk_widget_modify_bg (shellHandle,  OS.GTK_STATE_NORMAL, color);
         }
-        int bits = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
+        int bits = DWT.PRIMARY_MODAL | DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
         bool modal = (style & bits) !is 0;
         //TEMPORARY CODE
-        if ((style & SWT.ON_TOP) is 0) modal |= (parent !is null && (parent.style & bits) !is 0);
+        if ((style & DWT.ON_TOP) is 0) modal |= (parent !is null && (parent.style & bits) !is 0);
         OS.gtk_window_set_modal (cast(GtkWindow*)shellHandle, modal);
     } else {
         vboxHandle = OS.gtk_bin_get_child (cast(GtkBin*)shellHandle);
-        if (vboxHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (vboxHandle is null) error (DWT.ERROR_NO_HANDLES);
         auto children = OS.gtk_container_get_children (cast(GtkContainer*)vboxHandle);
         if (OS.g_list_length (children) > 0) {
             scrolledHandle = cast(GtkWidget*)OS.g_list_data (children);
         }
         OS.g_list_free (children);
-        if (scrolledHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (scrolledHandle is null) error (DWT.ERROR_NO_HANDLES);
         handle = OS.gtk_bin_get_child (cast(GtkBin*)scrolledHandle);
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
     }
     /*
     * Feature in GTK.  Realizing the shell triggers a size allocate event,
@@ -677,7 +677,7 @@
                         if (tooltipsHandle !is null) OS.gtk_tooltips_enable (cast(GtkTooltips*)tooltipsHandle);
                         display.activeShell = this;
                         display.activePending = false;
-                        sendEvent (SWT.Activate);
+                        sendEvent (DWT.Activate);
                         break;
                     default:
                 }
@@ -691,7 +691,7 @@
                     case OS.NotifyVirtual:
                         if (tooltipsHandle !is null) OS.gtk_tooltips_disable (cast(GtkTooltips*)tooltipsHandle);
                         Display display = this.display;
-                        sendEvent (SWT.Deactivate);
+                        sendEvent (DWT.Deactivate);
                         setActiveControl (null);
                         if (display.activeShell is this) {
                             display.activeShell = null;
@@ -743,8 +743,8 @@
 
 bool isUndecorated () {
     return
-        (style & (SWT.SHELL_TRIM | SWT.BORDER)) is SWT.NONE ||
-        (style & (SWT.NO_TRIM | SWT.ON_TOP)) !is 0;
+        (style & (DWT.SHELL_TRIM | DWT.BORDER)) is DWT.NONE ||
+        (style & (DWT.NO_TRIM | DWT.ON_TOP)) !is 0;
 }
 
 override public bool isVisible () {
@@ -827,7 +827,7 @@
  *
  * @return the receiver's size
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -846,7 +846,7 @@
     int width = OS.GTK_WIDGET_WIDTH (vboxHandle);
     int height = OS.GTK_WIDGET_HEIGHT (vboxHandle);
     int border = 0;
-    if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) is 0) {
+    if ((style & (DWT.NO_TRIM | DWT.BORDER | DWT.SHELL_TRIM)) is 0) {
         border = OS.gtk_container_get_border_width (cast(GtkContainer*)shellHandle);
     }
     return new Point (width + trimWidth () + 2*border, height + trimHeight () + 2*border);
@@ -863,7 +863,7 @@
  *
  * @return the region that defines the shape of the shell (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -880,22 +880,22 @@
  * Returns the receiver's input method editor mode. This
  * will be the result of bitwise OR'ing together one or
  * more of the following constants defined in class
- * <code>SWT</code>:
+ * <code>DWT</code>:
  * <code>NONE</code>, <code>ROMAN</code>, <code>DBCS</code>,
  * <code>PHONETIC</code>, <code>NATIVE</code>, <code>ALPHA</code>.
  *
  * @return the IME mode
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  */
 public int getImeInputMode () {
     checkWidget();
-    return SWT.NONE;
+    return DWT.NONE;
 }
 
 override Shell _getShell () {
@@ -907,7 +907,7 @@
  * <p>
  * @return the dialog shells
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -944,7 +944,7 @@
         moved = true;
         oldX = x;
         oldY = y;
-        sendEvent (SWT.Move);
+        sendEvent (DWT.Move);
         // widget could be disposed at this point
     }
     return 0;
@@ -968,8 +968,8 @@
         case OS.GTK_DIR_TAB_BACKWARD:
             Control control = display.getFocusControl ();
             if (control !is null) {
-                if ((control.state & CANVAS) !is 0 && (control.style & SWT.EMBEDDED) !is 0) {
-                    int traversal = directionType is OS.GTK_DIR_TAB_FORWARD ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
+                if ((control.state & CANVAS) !is 0 && (control.style & DWT.EMBEDDED) !is 0) {
+                    int traversal = directionType is OS.GTK_DIR_TAB_FORWARD ? DWT.TRAVERSE_TAB_NEXT : DWT.TRAVERSE_TAB_PREVIOUS;
                     control.traverse (traversal);
                     return 1;
                 }
@@ -1000,7 +1000,7 @@
 
 override int /*long*/ gtk_map_event (GtkWidget* widget, int /*long*/ event) {
     minimized = false;
-    sendEvent (SWT.Deiconify);
+    sendEvent (DWT.Deiconify);
     return 0;
 }
 
@@ -1018,26 +1018,26 @@
 override int /*long*/ gtk_realize (GtkWidget* widget) {
     auto result = super.gtk_realize (widget);
     auto window = OS.GTK_WIDGET_WINDOW (shellHandle);
-    if ((style & SWT.SHELL_TRIM) !is SWT.SHELL_TRIM) {
+    if ((style & DWT.SHELL_TRIM) !is DWT.SHELL_TRIM) {
         int decorations = 0;
-        if ((style & SWT.NO_TRIM) is 0) {
-            if ((style & SWT.MIN) !is 0) decorations |= OS.GDK_DECOR_MINIMIZE;
-            if ((style & SWT.MAX) !is 0) decorations |= OS.GDK_DECOR_MAXIMIZE;
-            if ((style & SWT.RESIZE) !is 0) decorations |= OS.GDK_DECOR_RESIZEH;
-            if ((style & SWT.BORDER) !is 0) decorations |= OS.GDK_DECOR_BORDER;
-            if ((style & SWT.MENU) !is 0) decorations |= OS.GDK_DECOR_MENU;
-            if ((style & SWT.TITLE) !is 0) decorations |= OS.GDK_DECOR_TITLE;
+        if ((style & DWT.NO_TRIM) is 0) {
+            if ((style & DWT.MIN) !is 0) decorations |= OS.GDK_DECOR_MINIMIZE;
+            if ((style & DWT.MAX) !is 0) decorations |= OS.GDK_DECOR_MAXIMIZE;
+            if ((style & DWT.RESIZE) !is 0) decorations |= OS.GDK_DECOR_RESIZEH;
+            if ((style & DWT.BORDER) !is 0) decorations |= OS.GDK_DECOR_BORDER;
+            if ((style & DWT.MENU) !is 0) decorations |= OS.GDK_DECOR_MENU;
+            if ((style & DWT.TITLE) !is 0) decorations |= OS.GDK_DECOR_TITLE;
             /*
             * Feature in GTK.  Under some Window Managers (Sawmill), in order
             * to get any border at all from the window manager it is necessary to
             * set GDK_DECOR_BORDER.  The fix is to force these bits when any
             * kind of border is requested.
             */
-            if ((style & SWT.RESIZE) !is 0) decorations |= OS.GDK_DECOR_BORDER;
+            if ((style & DWT.RESIZE) !is 0) decorations |= OS.GDK_DECOR_BORDER;
         }
         OS.gdk_window_set_decorations (window, decorations);
     }
-    if ((style & SWT.ON_TOP) !is 0) {
+    if ((style & DWT.ON_TOP) !is 0) {
         OS.gdk_window_set_override_redirect (window, true);
     }
     return result;
@@ -1045,7 +1045,7 @@
 
 override int /*long*/ gtk_unmap_event (GtkWidget* widget, int /*long*/ event) {
     minimized = true;
-    sendEvent (SWT.Iconify);
+    sendEvent (DWT.Iconify);
     return 0;
 }
 
@@ -1063,7 +1063,7 @@
  * sets the focus and asks the window manager to make the
  * shell active.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1093,7 +1093,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1103,13 +1103,13 @@
  */
 public void removeShellListener (ShellListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Close, listener);
-    eventTable.unhook (SWT.Iconify,listener);
-    eventTable.unhook (SWT.Deiconify,listener);
-    eventTable.unhook (SWT.Activate, listener);
-    eventTable.unhook (SWT.Deactivate, listener);
+    eventTable.unhook (DWT.Close, listener);
+    eventTable.unhook (DWT.Iconify,listener);
+    eventTable.unhook (DWT.Deiconify,listener);
+    eventTable.unhook (DWT.Activate, listener);
+    eventTable.unhook (DWT.Deactivate, listener);
 }
 
 /**
@@ -1119,7 +1119,7 @@
  * the receiver's children will be drawn behind it) and asks
  * the window manager to make the shell active
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1165,12 +1165,12 @@
     */
     for (int i=deactivate.length-1; i>=index; --i) {
         if (!deactivate [i].isDisposed ()) {
-            deactivate [i].sendEvent (SWT.Deactivate);
+            deactivate [i].sendEvent (DWT.Deactivate);
         }
     }
     for (int i=activate.length-1; i>=index; --i) {
         if (!activate [i].isDisposed ()) {
-            activate [i].sendEvent (SWT.Activate);
+            activate [i].sendEvent (DWT.Activate);
         }
     }
 }
@@ -1189,7 +1189,7 @@
     forceResize (boxWidth, boxHeight);
     if (notify) {
         resized = true;
-        sendEvent (SWT.Resize);
+        sendEvent (DWT.Resize);
         if (isDisposed ()) return;
         if (layout_ !is null) {
             markLayout (false, false);
@@ -1222,7 +1222,7 @@
             moved = true;
             oldX = x;
             oldY = y;
-            sendEvent (SWT.Move);
+            sendEvent (DWT.Move);
             if (isDisposed ()) return 0;
             result |= MOVED;
         }
@@ -1230,7 +1230,7 @@
     if (resize) {
         width = Math.max (1, Math.max (minWidth, width - trimWidth ()));
         height = Math.max (1, Math.max (minHeight, height - trimHeight ()));
-        if ((style & SWT.RESIZE) !is 0) OS.gtk_window_resize (cast(GtkWindow*)shellHandle, width, height);
+        if ((style & DWT.RESIZE) !is 0) OS.gtk_window_resize (cast(GtkWindow*)shellHandle, width, height);
         bool changed = width !is oldWidth || height !is oldHeight;
         if (changed) {
             oldWidth = width;
@@ -1262,7 +1262,7 @@
     Control control = null;
     bool fixFocus_ = false;
     if (!enabled) {
-        if (display.focusEvent !is SWT.FocusOut) {
+        if (display.focusEvent !is DWT.FocusOut) {
             control = display.getFocusControl ();
             fixFocus_ = isFocusAncestor (control);
         }
@@ -1315,18 +1315,18 @@
 /**
  * Sets the input method editor mode to the argument which
  * should be the result of bitwise OR'ing together one or more
- * of the following constants defined in class <code>SWT</code>:
+ * of the following constants defined in class <code>DWT</code>:
  * <code>NONE</code>, <code>ROMAN</code>, <code>DBCS</code>,
  * <code>PHONETIC</code>, <code>NATIVE</code>, <code>ALPHA</code>.
  *
  * @param mode the new IME mode
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  */
 public void setImeInputMode (int mode) {
     checkWidget();
@@ -1338,7 +1338,7 @@
     Rectangle rect = monitor.getClientArea ();
     int width = rect.width * 5 / 8;
     int height = rect.height * 5 / 8;
-    if ((style & SWT.RESIZE) !is 0) {
+    if ((style & DWT.RESIZE) !is 0) {
         OS.gtk_window_resize (cast(GtkWindow*)shellHandle, width, height);
     }
     resizeBounds (width, height, false);
@@ -1359,8 +1359,8 @@
     if (menuBar is menu) return;
     bool both = menu !is null && menuBar !is null;
     if (menu !is null) {
-        if ((menu.style & SWT.BAR) is 0) error (SWT.ERROR_MENU_NOT_BAR);
-        if (menu.parent !is this) error (SWT.ERROR_INVALID_PARENT);
+        if ((menu.style & DWT.BAR) is 0) error (DWT.ERROR_MENU_NOT_BAR);
+        if (menu.parent !is this) error (DWT.ERROR_INVALID_PARENT);
     }
     if (menuBar !is null) {
         auto menuHandle = menuBar.handle;
@@ -1399,7 +1399,7 @@
  * @param width the new minimum width for the receiver
  * @param height the new minimum height for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1424,7 +1424,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1433,7 +1433,7 @@
  */
 public void setMinimumSize (Point size) {
     checkWidget ();
-    if (size is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (size is null) error (DWT.ERROR_NULL_ARGUMENT);
     setMinimumSize (size.x, size.y);
 }
 
@@ -1441,7 +1441,7 @@
  * Sets the shape of the shell to the region specified
  * by the argument.  When the argument is null, the
  * default shape of the shell is restored.  The shell
- * must be created with the style SWT.NO_TRIM in order
+ * must be created with the style DWT.NO_TRIM in order
  * to specify a region.
  *
  * @param region the region that defines the shape of the shell (or null)
@@ -1449,7 +1449,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the region has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1459,8 +1459,8 @@
  */
 public void setRegion (Region region) {
     checkWidget ();
-    if ((style & SWT.NO_TRIM) is 0) return;
-    if (region !is null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if ((style & DWT.NO_TRIM) is 0) return;
+    if (region !is null && region.isDisposed()) error (DWT.ERROR_INVALID_ARGUMENT);
     auto window = OS.GTK_WIDGET_WINDOW (shellHandle);
     auto shape_region = (region is null) ? null : region.handle;
     OS.gdk_window_shape_combine_region (window, shape_region, 0, 0);
@@ -1494,7 +1494,7 @@
     checkWidget();
     if ((OS.GTK_WIDGET_MAPPED (shellHandle) is visible)) return;
     if (visible) {
-        sendEvent (SWT.Show);
+        sendEvent (DWT.Show);
         if (isDisposed ()) return;
 
         /*
@@ -1539,7 +1539,7 @@
         }
         mapped = true;
 
-        int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
+        int mask = DWT.PRIMARY_MODAL | DWT.APPLICATION_MODAL | DWT.SYSTEM_MODAL;
         if ((style & mask) !is 0) {
             OS.gdk_pointer_ungrab (OS.GDK_CURRENT_TIME);
         }
@@ -1549,7 +1549,7 @@
             Point location = getLocation();
             oldX = location.x;
             oldY = location.y;
-            sendEvent (SWT.Move);
+            sendEvent (DWT.Move);
             if (isDisposed ()) return;
         }
         if (!resized) {
@@ -1557,7 +1557,7 @@
             Point size = getSize ();
             oldWidth = size.x - trimWidth ();
             oldHeight = size.y - trimHeight ();
-            sendEvent (SWT.Resize);
+            sendEvent (DWT.Resize);
             if (isDisposed ()) return;
             if (layout_ !is null) {
                 markLayout (false, false);
@@ -1567,7 +1567,7 @@
     } else {
         fixActiveShell ();
         OS.gtk_widget_hide (shellHandle);
-        sendEvent (SWT.Hide);
+        sendEvent (DWT.Hide);
     }
 }
 
@@ -1633,11 +1633,11 @@
     return true;
 }
 int trimHeight () {
-    if ((style & SWT.NO_TRIM) !is 0) return 0;
+    if ((style & DWT.NO_TRIM) !is 0) return 0;
     bool hasTitle = false, hasResize = false, hasBorder = false;
-    hasTitle = (style & (SWT.MIN | SWT.MAX | SWT.TITLE | SWT.MENU)) !is 0;
-    hasResize = (style & SWT.RESIZE) !is 0;
-    hasBorder = (style & SWT.BORDER) !is 0;
+    hasTitle = (style & (DWT.MIN | DWT.MAX | DWT.TITLE | DWT.MENU)) !is 0;
+    hasResize = (style & DWT.RESIZE) !is 0;
+    hasBorder = (style & DWT.BORDER) !is 0;
     if (hasTitle) {
         if (hasResize) return display.titleResizeTrimHeight;
         if (hasBorder) return display.titleBorderTrimHeight;
@@ -1649,11 +1649,11 @@
 }
 
 int trimWidth () {
-    if ((style & SWT.NO_TRIM) !is 0) return 0;
+    if ((style & DWT.NO_TRIM) !is 0) return 0;
     bool hasTitle = false, hasResize = false, hasBorder = false;
-    hasTitle = (style & (SWT.MIN | SWT.MAX | SWT.TITLE | SWT.MENU)) !is 0;
-    hasResize = (style & SWT.RESIZE) !is 0;
-    hasBorder = (style & SWT.BORDER) !is 0;
+    hasTitle = (style & (DWT.MIN | DWT.MAX | DWT.TITLE | DWT.MENU)) !is 0;
+    hasResize = (style & DWT.RESIZE) !is 0;
+    hasBorder = (style & DWT.BORDER) !is 0;
     if (hasTitle) {
         if (hasResize) return display.titleResizeTrimWidth;
         if (hasBorder) return display.titleBorderTrimWidth;
@@ -1687,7 +1687,7 @@
  * the receiver's children will be drawn behind it) and forces
  * the window manager to make the shell active.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1713,7 +1713,7 @@
     int width = OS.GTK_WIDGET_WIDTH (vboxHandle);
     int height = OS.GTK_WIDGET_HEIGHT (vboxHandle);
     int border = 0;
-    if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) is 0) {
+    if ((style & (DWT.NO_TRIM | DWT.BORDER | DWT.SHELL_TRIM)) is 0) {
         border = OS.gtk_container_get_border_width (cast(GtkContainer*)shellHandle);
     }
     return new Rectangle (x, y, width + trimWidth () + 2*border, height + trimHeight () + 2*border);
@@ -1751,7 +1751,7 @@
     char* buffer = toStringz( string );
     if (tooltipsHandle is null) {
         tooltipsHandle = cast(GtkWidget*)OS.gtk_tooltips_new ();
-        if (tooltipsHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (tooltipsHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.g_object_ref (tooltipsHandle);
         OS.gtk_object_sink (cast(GtkObject*)tooltipsHandle);
     }
--- a/dwt/widgets/Slider.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Slider.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,7 +15,7 @@
 import dwt.widgets.Composite;
 import dwt.widgets.TypedListener;
 import dwt.widgets.Event;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.events.SelectionListener;
@@ -50,7 +50,7 @@
  * maximum and minimum values). Typically, this is used to
  * indicate some proportional value such as the ratio of the
  * visible area of a document to the total amount of space that
- * it would take to display it. SWT supports setting the thumb
+ * it would take to display it. DWT supports setting the thumb
  * size even if the underlying platform does not, but in this
  * case the appearance of the slider will not change.
  * </p>
@@ -76,10 +76,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -90,13 +90,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#HORIZONTAL
- * @see SWT#VERTICAL
+ * @see DWT#HORIZONTAL
+ * @see DWT#VERTICAL
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -111,14 +111,14 @@
  * interface.
  * <p>
  * When <code>widgetSelected</code> is called, the event object detail field contains one of the following values:
- * <code>SWT.NONE</code> - for the end of a drag.
- * <code>SWT.DRAG</code>.
- * <code>SWT.HOME</code>.
- * <code>SWT.END</code>.
- * <code>SWT.ARROW_DOWN</code>.
- * <code>SWT.ARROW_UP</code>.
- * <code>SWT.PAGE_DOWN</code>.
- * <code>SWT.PAGE_UP</code>.
+ * <code>DWT.NONE</code> - for the end of a drag.
+ * <code>DWT.DRAG</code>.
+ * <code>DWT.HOME</code>.
+ * <code>DWT.END</code>.
+ * <code>DWT.ARROW_DOWN</code>.
+ * <code>DWT.ARROW_UP</code>.
+ * <code>DWT.PAGE_DOWN</code>.
+ * <code>DWT.PAGE_UP</code>.
  * <code>widgetDefaultSelected</code> is not called.
  * </p>
  *
@@ -127,7 +127,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -138,29 +138,29 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 static int checkStyle (int style) {
-    return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
+    return checkBits (style, DWT.HORIZONTAL, DWT.VERTICAL, 0, 0, 0, 0);
 }
 
 override void createHandle (int index) {
     state |= HANDLE;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     auto hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
-    if (hAdjustment is null) error (SWT.ERROR_NO_HANDLES);
-    if ((style & SWT.HORIZONTAL) !is 0) {
+    if (hAdjustment is null) error (DWT.ERROR_NO_HANDLES);
+    if ((style & DWT.HORIZONTAL) !is 0) {
         handle = cast(GtkWidget*)OS.gtk_hscrollbar_new (cast(GtkAdjustment*)hAdjustment);
     } else {
         handle = cast(GtkWidget*)OS.gtk_vscrollbar_new (cast(GtkAdjustment*)hAdjustment);
     }
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
 }
@@ -182,26 +182,26 @@
     Event event = new Event ();
     dragSent = detail is OS.GTK_SCROLL_JUMP;
     switch (detail) {
-        case OS.GTK_SCROLL_NONE:            event.detail = SWT.NONE; break;
-        case OS.GTK_SCROLL_JUMP:            event.detail = SWT.DRAG; break;
-        case OS.GTK_SCROLL_START:           event.detail = SWT.HOME; break;
-        case OS.GTK_SCROLL_END:             event.detail = SWT.END; break;
+        case OS.GTK_SCROLL_NONE:            event.detail = DWT.NONE; break;
+        case OS.GTK_SCROLL_JUMP:            event.detail = DWT.DRAG; break;
+        case OS.GTK_SCROLL_START:           event.detail = DWT.HOME; break;
+        case OS.GTK_SCROLL_END:             event.detail = DWT.END; break;
         case OS.GTK_SCROLL_PAGE_DOWN:
         case OS.GTK_SCROLL_PAGE_RIGHT:
-        case OS.GTK_SCROLL_PAGE_FORWARD:    event.detail = SWT.PAGE_DOWN; break;
+        case OS.GTK_SCROLL_PAGE_FORWARD:    event.detail = DWT.PAGE_DOWN; break;
         case OS.GTK_SCROLL_PAGE_UP:
         case OS.GTK_SCROLL_PAGE_LEFT:
-        case OS.GTK_SCROLL_PAGE_BACKWARD:   event.detail = SWT.PAGE_UP; break;
+        case OS.GTK_SCROLL_PAGE_BACKWARD:   event.detail = DWT.PAGE_UP; break;
         case OS.GTK_SCROLL_STEP_DOWN:
         case OS.GTK_SCROLL_STEP_RIGHT:
-        case OS.GTK_SCROLL_STEP_FORWARD:    event.detail = SWT.ARROW_DOWN; break;
+        case OS.GTK_SCROLL_STEP_FORWARD:    event.detail = DWT.ARROW_DOWN; break;
         case OS.GTK_SCROLL_STEP_UP:
         case OS.GTK_SCROLL_STEP_LEFT:
-        case OS.GTK_SCROLL_STEP_BACKWARD:   event.detail = SWT.ARROW_UP; break;
+        case OS.GTK_SCROLL_STEP_BACKWARD:   event.detail = DWT.ARROW_UP; break;
         default:
     }
     if (!dragSent) detail = OS.GTK_SCROLL_NONE;
-    postEvent (SWT.Selection, event);
+    postEvent (DWT.Selection, event);
     return 0;
 }
 
@@ -209,13 +209,13 @@
     switch (gdkEvent.type) {
         case OS.GDK_BUTTON_RELEASE: {
             GdkEventButton* gdkEventButton = cast(GdkEventButton*)gdkEvent;
-            if (gdkEventButton.button is 1 && detail is SWT.DRAG) {
+            if (gdkEventButton.button is 1 && detail is DWT.DRAG) {
                 if (!dragSent) {
                     Event event = new Event ();
-                    event.detail = SWT.DRAG;
-                    postEvent (SWT.Selection, event);
+                    event.detail = DWT.DRAG;
+                    postEvent (DWT.Selection, event);
                 }
-                postEvent (SWT.Selection);
+                postEvent (DWT.Selection);
             }
             detail = OS.GTK_SCROLL_NONE;
             dragSent = false;
@@ -248,13 +248,13 @@
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     Point size = computeNativeSize(handle, wHint, hHint, changed);
-    if ((style & SWT.HORIZONTAL) !is 0) {
-        if (wHint is SWT.DEFAULT) size.x = 2 * size.x;
+    if ((style & DWT.HORIZONTAL) !is 0) {
+        if (wHint is DWT.DEFAULT) size.x = 2 * size.x;
     } else {
-        if (hHint is SWT.DEFAULT) size.y = 2 * size.y;
+        if (hHint is DWT.DEFAULT) size.y = 2 * size.y;
     }
     return size;
 }
@@ -266,7 +266,7 @@
  *
  * @return the increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -282,7 +282,7 @@
  *
  * @return the maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -298,7 +298,7 @@
  *
  * @return the minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -316,7 +316,7 @@
  *
  * @return the page increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -332,7 +332,7 @@
  *
  * @return the selection
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -349,7 +349,7 @@
  *
  * @return the thumb value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -369,7 +369,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -379,10 +379,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection,listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection,listener);
 }
 
 /**
@@ -393,7 +393,7 @@
  *
  * @param value the new increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -414,7 +414,7 @@
  *
  * @param value the new maximum, which must be greater than the current minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -440,7 +440,7 @@
  *
  * @param value the new minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -461,8 +461,8 @@
 
 void setOrientation () {
     super.setOrientation ();
-    if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
-        if ((style & SWT.HORIZONTAL) !is 0) {
+    if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
+        if ((style & DWT.HORIZONTAL) !is 0) {
             OS.gtk_range_set_inverted (cast(GtkRange*)handle, true);
         }
     }
@@ -476,7 +476,7 @@
  *
  * @param value the page increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -496,7 +496,7 @@
  *
  * @param value the new selection (must be zero or greater)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -517,7 +517,7 @@
  * @param value the new thumb value, which must be at least one and not
  * larger than the size of the current range
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -550,7 +550,7 @@
  * @param increment the new increment value
  * @param pageIncrement the new pageIncrement value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/Spinner.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Spinner.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,7 +15,7 @@
 import dwt.widgets.TypedListener;
 import dwt.widgets.Event;
 import dwt.widgets.Widget;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
@@ -63,10 +63,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -77,13 +77,13 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#READ_ONLY
- * @see SWT#WRAP
+ * @see DWT#READ_ONLY
+ * @see DWT#WRAP
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -102,7 +102,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -112,9 +112,9 @@
  */
 public void addModifyListener (ModifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Modify, typedListener);
+    addListener (DWT.Modify, typedListener);
 }
 
 /**
@@ -132,7 +132,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -143,10 +143,10 @@
  */
 public void addSelectionListener(SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener(listener);
-    addListener(SWT.Selection,typedListener);
-    addListener(SWT.DefaultSelection,typedListener);
+    addListener(DWT.Selection,typedListener);
+    addListener(DWT.DefaultSelection,typedListener);
 }
 
 /**
@@ -160,7 +160,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -170,9 +170,9 @@
  */
 void addVerifyListener (VerifyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Verify, typedListener);
+    addListener (DWT.Verify, typedListener);
 }
 
 static int checkStyle (int style) {
@@ -181,19 +181,19 @@
     * 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.
+    * the DWT style.
     */
-    return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
+    return style & ~(DWT.H_SCROLL | DWT.V_SCROLL);
 }
 
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     int w, h;
     OS.gtk_widget_realize (handle);
     auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)handle);
@@ -219,8 +219,8 @@
     OS.pango_layout_set_text (layout, buffer2.ptr, buffer2.length);
     int width = OS.PANGO_PIXELS (w);
     int height = OS.PANGO_PIXELS (h);
-    width = wHint is SWT.DEFAULT ? width : wHint;
-    height = hHint is SWT.DEFAULT ? height : hHint;
+    width = wHint is DWT.DEFAULT ? width : wHint;
+    height = hHint is DWT.DEFAULT ? height : hHint;
     Rectangle trim = computeTrim (0, 0, width, height);
     return new Point (trim.width, trim.height);
 }
@@ -229,7 +229,7 @@
     checkWidget ();
     int xborder = 0, yborder = 0;
     auto style = OS.gtk_widget_get_style (handle);
-    if ((this.style & SWT.BORDER) !is 0) {
+    if ((this.style & DWT.BORDER) !is 0) {
         xborder += OS.gtk_style_get_xthickness (style);
         yborder += OS.gtk_style_get_ythickness (style);
     }
@@ -261,7 +261,7 @@
  * The current selection is copied to the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -274,16 +274,16 @@
 override void createHandle (int index) {
     state |= HANDLE | MENU;
     fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
     auto adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
-    if (adjustment is null) error (SWT.ERROR_NO_HANDLES);
+    if (adjustment is null) error (DWT.ERROR_NO_HANDLES);
     handle = cast(GtkWidget*)OS.gtk_spin_button_new (cast(GtkAdjustment*)adjustment, 1, 0);
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
-    OS.gtk_editable_set_editable (cast(GtkEditable*)handle, (style & SWT.READ_ONLY) is 0);
-    OS.gtk_entry_set_has_frame (cast(GtkEntry*)handle, (style & SWT.BORDER) !is 0);
-    OS.gtk_spin_button_set_wrap (cast(GtkSpinButton*)handle, (style & SWT.WRAP) !is 0);
+    OS.gtk_editable_set_editable (cast(GtkEditable*)handle, (style & DWT.READ_ONLY) is 0);
+    OS.gtk_entry_set_has_frame (cast(GtkEntry*)handle, (style & DWT.BORDER) !is 0);
+    OS.gtk_spin_button_set_wrap (cast(GtkSpinButton*)handle, (style & DWT.WRAP) !is 0);
 }
 
 /**
@@ -293,7 +293,7 @@
  * clipboard and then deleted from the widget.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -334,10 +334,10 @@
     /*
     *  The IM filter has to be called one time for each key press event.
     *  When the IM is open the key events are duplicated. The first event
-    *  is filtered by SWT and the second event is filtered by GTK.  In some
+    *  is filtered by DWT and the second event is filtered by GTK.  In some
     *  cases the GTK handler does not run (the widget is destroyed, the
     *  application code consumes the event, etc), for these cases the IM
-    *  filter has to be called by SWT.
+    *  filter has to be called by DWT.
     */
     if (gdkEventKey !is null && gdkEventKey !is cast(GdkEventKey*)-1) {
         auto imContext = imContext ();
@@ -357,7 +357,7 @@
 public int getBorderWidth () {
     checkWidget();
     auto style = OS.gtk_widget_get_style (handle);
-    if ((this.style & SWT.BORDER) !is 0) {
+    if ((this.style & DWT.BORDER) !is 0) {
          return OS.gtk_style_get_xthickness (style);
     }
     return 0;
@@ -373,7 +373,7 @@
  *
  * @return the increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -391,7 +391,7 @@
  *
  * @return the maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -409,7 +409,7 @@
  *
  * @return the minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -428,7 +428,7 @@
  *
  * @return the page increment
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -446,7 +446,7 @@
  *
  * @return the selection
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -464,7 +464,7 @@
  *
  * @return the digits
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -480,7 +480,7 @@
 }
 
 override int /*long*/ gtk_activate (GtkWidget* widget) {
-    postEvent (SWT.DefaultSelection);
+    postEvent (DWT.DefaultSelection);
     return 0;
 }
 
@@ -518,9 +518,9 @@
         OS.gdk_event_free (eventPtr);
     }
     if (keyPress) {
-        postEvent (SWT.Modify);
+        postEvent (DWT.Modify);
     } else {
-        sendEvent (SWT.Modify);
+        sendEvent (DWT.Modify);
     }
     return 0;
 }
@@ -530,7 +530,7 @@
     if (!OS.gtk_editable_get_editable (cast(GtkEditable*)handle)) return 0;
     char [] chars = fromUtf8z( text ).dup;
     if (chars.length is 0) return 0;
-    char [] newChars = sendIMKeyEvent (SWT.KeyDown, null, chars);
+    char [] newChars = sendIMKeyEvent (DWT.KeyDown, null, chars);
     if (newChars is null) return 0;
     /*
     * Feature in GTK.  For a GtkEntry, during the insert-text signal,
@@ -560,7 +560,7 @@
 }
 
 override int /*long*/ gtk_delete_text (GtkWidget* widget, int start_pos, int end_pos) {
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     char[] newText = verifyText ("", cast(int)/*64*/start_pos, cast(int)/*64*/end_pos);
     if (newText is null) {
         OS.g_signal_stop_emission_by_name (handle, OS.delete_text.ptr);
@@ -590,7 +590,7 @@
 }
 
 override int /*long*/ gtk_insert_text (GtkEditable* widget, char* new_text, int new_text_length, int position) {
-//  if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+//  if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     if (new_text is null || new_text_length is 0) return 0;
     char[] oldText = new_text[ 0 .. new_text_length ].dup;
     int pos;
@@ -636,7 +636,7 @@
 }
 
 override int /*long*/ gtk_value_changed (int  adjustment) {
-    postEvent (SWT.Selection);
+    postEvent (DWT.Selection);
     return 0;
 }
 
@@ -675,7 +675,7 @@
  * and new text inserted from the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -705,7 +705,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -715,9 +715,9 @@
  */
 public void removeModifyListener (ModifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Modify, listener);
+    eventTable.unhook (DWT.Modify, listener);
 }
 
 /**
@@ -729,7 +729,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -739,10 +739,10 @@
  */
 public void removeSelectionListener(SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook(SWT.Selection, listener);
-    eventTable.unhook(SWT.DefaultSelection,listener);
+    eventTable.unhook(DWT.Selection, listener);
+    eventTable.unhook(DWT.DefaultSelection,listener);
 }
 
 /**
@@ -754,7 +754,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -764,9 +764,9 @@
  */
 void removeVerifyListener (VerifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Verify, listener);
+    eventTable.unhook (DWT.Verify, listener);
 }
 
 void setBackgroundColor (GdkColor* color) {
@@ -792,7 +792,7 @@
  *
  * @param value the new increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -817,7 +817,7 @@
  *
  * @param value the new maximum, which must be greater than the current minimum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -843,7 +843,7 @@
  *
  * @param value the new minimum, which must be nonnegative and less than the current maximum
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -868,7 +868,7 @@
  *
  * @param value the page increment (must be greater than zero)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -893,7 +893,7 @@
  *
  * @param value the new selection (must be zero or greater)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -923,14 +923,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the value is less than zero</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setDigits (int value) {
     checkWidget ();
-    if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (value < 0) error (DWT.ERROR_INVALID_ARGUMENT);
     int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
     if (value is digits) return;
     auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
@@ -969,7 +969,7 @@
  * @param increment the new increment value
  * @param pageIncrement the new pageIncrement value
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1052,7 +1052,7 @@
      * event.  If this happens, answer null to cancel
      * the operation.
      */
-    sendEvent (SWT.Verify, event);
+    sendEvent (DWT.Verify, event);
     if (!event.doit || isDisposed ()) return null;
     return event.text;
 }
--- a/dwt/widgets/Synchronizer.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Synchronizer.d	Tue Jan 15 06:44:34 2008 +0100
@@ -15,7 +15,7 @@
 import dwt.dwthelper.Runnable;
 import dwt.internal.Compatibility;
 
-import dwt.SWT;
+import dwt.DWT;
 import tango.core.Thread;
 import tango.core.Exception;
 
@@ -129,7 +129,7 @@
                 lock.run ();
             } catch (TracedException t) {
                 lock.throwable = t;
-                SWT.error (SWT.ERROR_FAILED_EXEC, t);
+                DWT.error (DWT.ERROR_FAILED_EXEC, t);
             } finally {
                 syncThread = null;
                 lock.notifyAll ();
@@ -147,7 +147,7 @@
  *
  * @param runnable code to run on the user-interface thread.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_FAILED_EXEC - if an exception occurred when executing the runnable</li>
  * </ul>
  *
@@ -181,7 +181,7 @@
             Compatibility.interrupt();
         }
         if (lock.throwable !is null) {
-            SWT.error (SWT.ERROR_FAILED_EXEC, lock.throwable);
+            DWT.error (DWT.ERROR_FAILED_EXEC, lock.throwable);
         }
     }
 }
--- a/dwt/widgets/Text.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Text.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
 module dwt.widgets.Text;
 
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Rectangle;
 import dwt.events.ModifyListener;
@@ -86,10 +86,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -100,15 +100,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 SWT#READ_ONLY
- * @see SWT#WRAP
+ * @see DWT#SINGLE
+ * @see DWT#MULTI
+ * @see DWT#READ_ONLY
+ * @see DWT#WRAP
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -117,64 +117,64 @@
 }
 
 static int checkStyle (int style) {
-    if ((style & SWT.SEARCH) !is 0) {
-        style |= SWT.SINGLE | SWT.BORDER;
-        style &= ~SWT.PASSWORD;
+    if ((style & DWT.SEARCH) !is 0) {
+        style |= DWT.SINGLE | DWT.BORDER;
+        style &= ~DWT.PASSWORD;
     }
-    style &= ~SWT.SEARCH;
-    if ((style & SWT.SINGLE) !is 0 && (style & SWT.MULTI) !is 0) {
-        style &= ~SWT.MULTI;
+    style &= ~DWT.SEARCH;
+    if ((style & DWT.SINGLE) !is 0 && (style & DWT.MULTI) !is 0) {
+        style &= ~DWT.MULTI;
     }
-    style = checkBits (style, SWT.LEFT, SWT.CENTER, SWT.RIGHT, 0, 0, 0);
-    if ((style & SWT.SINGLE) !is 0) style &= ~(SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-    if ((style & SWT.WRAP) !is 0) {
-        style |= SWT.MULTI;
-        style &= ~SWT.H_SCROLL;
+    style = checkBits (style, DWT.LEFT, DWT.CENTER, DWT.RIGHT, 0, 0, 0);
+    if ((style & DWT.SINGLE) !is 0) style &= ~(DWT.H_SCROLL | DWT.V_SCROLL | DWT.WRAP);
+    if ((style & DWT.WRAP) !is 0) {
+        style |= DWT.MULTI;
+        style &= ~DWT.H_SCROLL;
     }
-    if ((style & SWT.MULTI) !is 0) style &= ~SWT.PASSWORD;
-    if ((style & (SWT.SINGLE | SWT.MULTI)) !is 0) return style;
-    if ((style & (SWT.H_SCROLL | SWT.V_SCROLL)) !is 0) return style | SWT.MULTI;
-    return style | SWT.SINGLE;
+    if ((style & DWT.MULTI) !is 0) style &= ~DWT.PASSWORD;
+    if ((style & (DWT.SINGLE | DWT.MULTI)) !is 0) return style;
+    if ((style & (DWT.H_SCROLL | DWT.V_SCROLL)) !is 0) return style | DWT.MULTI;
+    return style | DWT.SINGLE;
 }
 
 override void createHandle (int index) {
     state |= HANDLE | MENU;
     fixedHandle = cast(GtkWidget*) OS.g_object_new (display.gtk_fixed_get_type (), null);
-    if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (fixedHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         handle = OS.gtk_entry_new ();
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
-        OS.gtk_editable_set_editable (cast(GtkEditable*)handle, (style & SWT.READ_ONLY) is 0);
-        OS.gtk_entry_set_has_frame (cast(GtkEntry*)handle, (style & SWT.BORDER) !is 0);
-        OS.gtk_entry_set_visibility (cast(GtkEntry*)handle, (style & SWT.PASSWORD) is 0);
+        OS.gtk_editable_set_editable (cast(GtkEditable*)handle, (style & DWT.READ_ONLY) is 0);
+        OS.gtk_entry_set_has_frame (cast(GtkEntry*)handle, (style & DWT.BORDER) !is 0);
+        OS.gtk_entry_set_visibility (cast(GtkEntry*)handle, (style & DWT.PASSWORD) is 0);
         float alignment = 0.0f;
-        if ((style & SWT.CENTER) !is 0) alignment = 0.5f;
-        if ((style & SWT.RIGHT) !is 0) alignment = 1.0f;
+        if ((style & DWT.CENTER) !is 0) alignment = 0.5f;
+        if ((style & DWT.RIGHT) !is 0) alignment = 1.0f;
         if (alignment > 0.0f) {
             OS.gtk_entry_set_alignment (cast(GtkEntry*)handle, alignment);
         }
     } else {
         scrolledHandle = cast(GtkWidget*) OS.gtk_scrolled_window_new (null, null);
-        if (scrolledHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (scrolledHandle is null) error (DWT.ERROR_NO_HANDLES);
         handle = OS.gtk_text_view_new ();
-        if (handle is null) error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) error (DWT.ERROR_NO_HANDLES);
         bufferHandle = OS.gtk_text_view_get_buffer (cast(GtkTextView*)handle);
-        if (bufferHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (bufferHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.gtk_container_add (cast(GtkContainer*)fixedHandle, scrolledHandle);
         OS.gtk_container_add (cast(GtkContainer*)scrolledHandle, handle);
-        OS.gtk_text_view_set_editable (cast(GtkTextView*)handle, (style & SWT.READ_ONLY) is 0);
-        if ((style & SWT.WRAP) !is 0) OS.gtk_text_view_set_wrap_mode (cast(GtkTextView*)handle, OS.GTK_WRAP_WORD);
-        int hsp = (style & SWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-        int vsp = (style & SWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
+        OS.gtk_text_view_set_editable (cast(GtkTextView*)handle, (style & DWT.READ_ONLY) is 0);
+        if ((style & DWT.WRAP) !is 0) OS.gtk_text_view_set_wrap_mode (cast(GtkTextView*)handle, OS.GTK_WRAP_WORD);
+        int hsp = (style & DWT.H_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
+        int vsp = (style & DWT.V_SCROLL) !is 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
         OS.gtk_scrolled_window_set_policy (cast(GtkScrolledWindow*)scrolledHandle, hsp, vsp);
-        if ((style & SWT.BORDER) !is 0) {
+        if ((style & DWT.BORDER) !is 0) {
             OS.gtk_scrolled_window_set_shadow_type (cast(GtkScrolledWindow*)scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
         }
         int just = OS.GTK_JUSTIFY_LEFT;
-        if ((style & SWT.CENTER) !is 0) just = OS.GTK_JUSTIFY_CENTER;
-        if ((style & SWT.RIGHT) !is 0) just = OS.GTK_JUSTIFY_RIGHT;
+        if ((style & DWT.CENTER) !is 0) just = OS.GTK_JUSTIFY_CENTER;
+        if ((style & DWT.RIGHT) !is 0) just = OS.GTK_JUSTIFY_RIGHT;
         OS.gtk_text_view_set_justification (cast(GtkTextView*)handle, just);
     }
 }
@@ -195,7 +195,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -205,9 +205,9 @@
  */
 public void addModifyListener (ModifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Modify, typedListener);
+    addListener (DWT.Modify, typedListener);
 }
 
 /**
@@ -218,8 +218,8 @@
  * <p>
  * <code>widgetSelected</code> is not called for texts.
  * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed in a single-line text,
- * or when ENTER is pressed in a search text. If the receiver has the <code>SWT.SEARCH | SWT.CANCEL</code> style
- * and the user cancels the search, the event object detail field contains the value <code>SWT.CANCEL</code>.
+ * or when ENTER is pressed in a search text. If the receiver has the <code>DWT.SEARCH | DWT.CANCEL</code> style
+ * and the user cancels the search, the event object detail field contains the value <code>DWT.CANCEL</code>.
  * </p>
  *
  * @param listener the listener which should be notified when the control is selected by the user
@@ -227,7 +227,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -238,10 +238,10 @@
  */
 public void addSelectionListener(SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener(listener);
-    addListener(SWT.Selection,typedListener);
-    addListener(SWT.DefaultSelection,typedListener);
+    addListener(DWT.Selection,typedListener);
+    addListener(DWT.DefaultSelection,typedListener);
 }
 
 /**
@@ -255,7 +255,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -265,9 +265,9 @@
  */
 public void addVerifyListener (VerifyListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Verify, typedListener);
+    addListener (DWT.Verify, typedListener);
 }
 
 /**
@@ -282,15 +282,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 append (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.SINGLE) !is 0) {
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.SINGLE) !is 0) {
         int dummy = -1;
         OS.gtk_editable_insert_text (cast(GtkEditable*)handle, string.ptr, string.length, &dummy );
         OS.gtk_editable_set_position (cast(GtkEditable*)handle, -1);
@@ -307,14 +307,14 @@
 /**
  * Clears the selection.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 clearSelection () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         int position = OS.gtk_editable_get_position (cast(GtkEditable*)handle);
         OS.gtk_editable_select_region (cast(GtkEditable*)handle, position, position);
     } else {
@@ -329,10 +329,10 @@
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
     checkWidget ();
-    if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
-    if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+    if (wHint !is DWT.DEFAULT && wHint < 0) wHint = 0;
+    if (hHint !is DWT.DEFAULT && hHint < 0) hHint = 0;
     int w , h;
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_widget_realize (handle);
         auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)handle);
         OS.pango_layout_get_size (layout, &w, &h);
@@ -350,7 +350,7 @@
     int width = OS.PANGO_PIXELS (w);
     int height = OS.PANGO_PIXELS (h);
     //This code is intentionally commented
-//  if ((style & SWT.SEARCH) !is 0 && message.length () !is 0) {
+//  if ((style & DWT.SEARCH) !is 0 && message.length () !is 0) {
 //      GC gc = new GC (this);
 //      Point size = gc.stringExtent (message);
 //      width = Math.max (width, size.x);
@@ -358,8 +358,8 @@
 //  }
     if (width is 0) width = DEFAULT_WIDTH;
     if (height is 0) height = DEFAULT_HEIGHT;
-    width = wHint is SWT.DEFAULT ? width : wHint;
-    height = hHint is SWT.DEFAULT ? height : hHint;
+    width = wHint is DWT.DEFAULT ? width : wHint;
+    height = hHint is DWT.DEFAULT ? height : hHint;
     Rectangle trim = computeTrim (0, 0, width, height);
     return new Point (trim.width, trim.height);
 }
@@ -368,8 +368,8 @@
     checkWidget ();
     Rectangle trim = super.computeTrim (x, y, width, height);
     int xborder = 0, yborder = 0;
-    if ((style & SWT.SINGLE) !is 0) {
-        if ((style & SWT.BORDER) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
+        if ((style & DWT.BORDER) !is 0) {
             auto style = OS.gtk_widget_get_style (handle);
             xborder += OS.gtk_style_get_xthickness (style);
             yborder += OS.gtk_style_get_ythickness (style);
@@ -401,14 +401,14 @@
  * The current selection is copied to the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 copy () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_copy_clipboard (cast(GtkEditable*)handle);
     } else {
         auto clipboard = OS.gtk_clipboard_get (cast(void*)OS.GDK_NONE);
@@ -423,14 +423,14 @@
  * clipboard and then deleted from the widget.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 cut () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_cut_clipboard (cast(GtkEditable*)handle);
     } else {
         auto clipboard = OS.gtk_clipboard_get (cast(void*)OS.GDK_NONE);
@@ -448,7 +448,7 @@
 override bool dragDetect (int x, int y, bool filter, bool* consume) {
     if (filter) {
         int start = 0, end = 0;
-        if ((style & SWT.SINGLE) !is 0) {
+        if ((style & DWT.SINGLE) !is 0) {
             int s, e;
             OS.gtk_editable_get_selection_bounds (cast(GtkEditable*)handle, &s, &e);
             start = s;
@@ -467,7 +467,7 @@
                 start = temp;
             }
             int position = -1;
-            if ((style & SWT.SINGLE) !is 0) {
+            if ((style & DWT.SINGLE) !is 0) {
                 int index;
                 int trailing;
                 auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)handle);
@@ -512,10 +512,10 @@
     /*
     *  The IM filter has to be called one time for each key press event.
     *  When the IM is open the key events are duplicated. The first event
-    *  is filtered by SWT and the second event is filtered by GTK.  In some
+    *  is filtered by DWT and the second event is filtered by GTK.  In some
     *  cases the GTK handler does not run (the widget is destroyed, the
     *  application code consumes the event, etc), for these cases the IM
-    *  filter has to be called by SWT.
+    *  filter has to be called by DWT.
     */
     if (gdkEventKey !is null && gdkEventKey !is cast(GdkEventKey*)-1) {
         auto imContext = imContext ();
@@ -534,9 +534,9 @@
 
 public int getBorderWidth () {
     checkWidget();
-    if ((style & SWT.MULTI) !is 0) return super.getBorderWidth ();
+    if ((style & DWT.MULTI) !is 0) return super.getBorderWidth ();
     auto style = OS.gtk_widget_get_style (handle);
-    if ((this.style & SWT.BORDER) !is 0) {
+    if ((this.style & DWT.BORDER) !is 0) {
          return OS.gtk_style_get_xthickness (style);
     }
     return 0;
@@ -550,14 +550,14 @@
  *
  * @return the line number
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getCaretLineNumber () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) return 1;
+    if ((style & DWT.SINGLE) !is 0) return 1;
     GtkTextIter position;
     auto mark = OS.gtk_text_buffer_get_insert (bufferHandle);
     OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, &position, mark);
@@ -573,14 +573,14 @@
  *
  * @return a point, the location of the caret
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getCaretLocation () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         int index = OS.gtk_editable_get_position (cast(GtkEditable*)handle);
         if (OS.GTK_VERSION >= OS.buildVERSION (2, 6, 0)) {
             index = OS.gtk_entry_text_index_to_layout_index (cast(GtkEntry*)handle, index);
@@ -613,14 +613,14 @@
  *
  * @return the position of the caret
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getCaretPosition () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0)  {
+    if ((style & DWT.SINGLE) !is 0)  {
         return OS.gtk_editable_get_position (cast(GtkEditable*)handle);
     }
     GtkTextIter position;
@@ -634,14 +634,14 @@
  *
  * @return number of characters in the widget
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getCharCount () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         auto ptr = OS.gtk_entry_get_text (cast(GtkEntry*)handle);
         return cast(int)/*64*/OS.g_utf8_strlen (ptr, -1);
     }
@@ -658,7 +658,7 @@
  *
  * @return whether or not double click is enabled
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -678,7 +678,7 @@
  *
  * @return the echo character
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -687,7 +687,7 @@
  */
 public char getEchoChar () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         if (!OS.gtk_entry_get_visibility (cast(GtkEntry*)handle)) {
             return OS.gtk_entry_get_invisible_char (cast(GtkEntry*)handle);
         }
@@ -700,14 +700,14 @@
  *
  * @return whether or not the receiver is editable
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool getEditable () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         return cast(bool)OS.gtk_editable_get_editable (cast(GtkEditable*)handle);
     }
     return cast(bool)OS.gtk_text_view_get_editable (cast(GtkTextView*)handle);
@@ -722,14 +722,14 @@
  *
  * @return the number of lines in the widget
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getLineCount () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) return 1;
+    if ((style & DWT.SINGLE) !is 0) return 1;
     return OS.gtk_text_buffer_get_line_count (bufferHandle);
 }
 
@@ -738,7 +738,7 @@
  *
  * @return a string that is the line delimiter
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -755,7 +755,7 @@
  *
  * @return the height of a row of text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -767,7 +767,7 @@
 
 /**
  * Returns the widget message. When the widget is created
- * with the style <code>SWT.SEARCH</code>, the message text
+ * with the style <code>DWT.SEARCH</code>, the message text
  * is displayed as a hint for the user, indicating the
  * purpose of the field.
  * <p>
@@ -777,7 +777,7 @@
  *
  * @return the widget message
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -791,11 +791,11 @@
 
 /**
  * Returns the orientation of the receiver, which will be one of the
- * constants <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
+ * constants <code>DWT.LEFT_TO_RIGHT</code> or <code>DWT.RIGHT_TO_LEFT</code>.
  *
  * @return the orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -804,14 +804,14 @@
  */
 public int getOrientation () {
     checkWidget();
-    return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
+    return style & (DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT);
 }
 
 /*public*/ int getPosition (Point point) {
     checkWidget ();
-    if (point is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (point is null) error (DWT.ERROR_NULL_ARGUMENT);
     int position = -1;
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         int index;
         int trailing;
         auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)handle);
@@ -839,14 +839,14 @@
  *
  * @return a point representing the selection start and end
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         int start;
         int end;
         OS.gtk_editable_get_selection_bounds (cast(GtkEditable*)handle, &start, &end);
@@ -863,7 +863,7 @@
  *
  * @return the number of selected characters.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -879,7 +879,7 @@
  *
  * @return the selected text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -900,7 +900,7 @@
  *
  * @return the number of tab characters
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -928,7 +928,7 @@
  *
  * @return the widget text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -936,7 +936,7 @@
 public char[] getText () {
     checkWidget ();
     char* address;
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         address = OS.gtk_entry_get_text (cast(GtkEntry*)handle);
     } else {
         GtkTextIter start;
@@ -946,7 +946,7 @@
     }
     if (address is null) return "";
     char[] res = fromUtf8z( address ).dup;
-    if ((style & SWT.MULTI) !is 0) OS.g_free (address);
+    if ((style & DWT.MULTI) !is 0) OS.g_free (address);
     return res;
 }
 
@@ -963,7 +963,7 @@
  * @param end the end of the range
  * @return the range of text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -973,7 +973,7 @@
     if (!(start <= end && 0 <= end)) return "";
     start = Math.max (0, start);
     char* address;
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         address = OS.gtk_editable_get_chars (cast(GtkEditable*)handle, start, end + 1);
     } else {
         int length = OS.gtk_text_buffer_get_char_count (bufferHandle);
@@ -984,7 +984,7 @@
         OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, &endIter, end + 1);
         address = OS.gtk_text_buffer_get_text (bufferHandle, &startIter, &endIter, true);
     }
-    if (address is null) error (SWT.ERROR_CANNOT_GET_TEXT);
+    if (address is null) error (DWT.ERROR_CANNOT_GET_TEXT);
     char[] res = fromUtf8z( address ).dup;
     OS.g_free (address);
     return res;
@@ -999,7 +999,7 @@
  *
  * @return the text limit
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1008,7 +1008,7 @@
  */
 public int getTextLimit () {
     checkWidget ();
-    if ((style & SWT.MULTI) !is 0) return LIMIT;
+    if ((style & DWT.MULTI) !is 0) return LIMIT;
     int limit = OS.gtk_entry_get_max_length (cast(GtkEntry*)handle);
     return limit is 0 ? 0xFFFF : limit;
 }
@@ -1022,14 +1022,14 @@
  *
  * @return the index of the top line
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SINGLE) !is 0) return 0;
+    if ((style & DWT.SINGLE) !is 0) return 0;
     GtkTextIter position;
     GdkRectangle rect;
     OS.gtk_text_view_get_visible_rect (cast(GtkTextView*)handle, &rect);
@@ -1052,14 +1052,14 @@
  *
  * @return the pixel position of the top line
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 getTopPixel () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) return 0;
+    if ((style & DWT.SINGLE) !is 0) return 0;
     GtkTextIter position;
     GdkRectangle rect;
     OS.gtk_text_view_get_visible_rect (cast(GtkTextView*)handle, &rect);
@@ -1069,7 +1069,7 @@
 }
 
 override int /*long*/ gtk_activate (GtkWidget* widget) {
-    postEvent (SWT.DefaultSelection);
+    postEvent (DWT.DefaultSelection);
     return 0;
 }
 
@@ -1109,21 +1109,21 @@
         OS.gdk_event_free (eventPtr);
     }
     if (keyPress) {
-        postEvent (SWT.Modify);
+        postEvent (DWT.Modify);
     } else {
-        sendEvent (SWT.Modify);
+        sendEvent (DWT.Modify);
     }
     return 0;
 }
 
 override int /*long*/ gtk_commit (GtkIMContext* imcontext, char* text) {
     if (text is null) return 0;
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         if (!OS.gtk_editable_get_editable (cast(GtkEditable*)handle)) return 0;
     }
     char [] chars = fromUtf8z( text ).dup;
     if (chars.length is 0) return 0;
-    char [] newChars = sendIMKeyEvent (SWT.KeyDown, null, chars);
+    char [] newChars = sendIMKeyEvent (DWT.KeyDown, null, chars);
     if (newChars is null) return 0;
     /*
      * Feature in GTK.  For a GtkEntry, during the insert-text signal,
@@ -1144,7 +1144,7 @@
     }
     OS.g_signal_handlers_unblock_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCOMMIT );
     OS.g_signal_handlers_block_matched (imContext, mask, id, 0, null, null, cast(void*)handle);
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         if (fixStart !is -1 && fixEnd !is -1) {
             OS.gtk_editable_set_position (cast(GtkEditable*)handle, fixStart);
             OS.gtk_editable_select_region (cast(GtkEditable*)handle, fixStart, fixEnd);
@@ -1155,7 +1155,7 @@
 }
 
 override int /*long*/ gtk_delete_range (GtkWidget* widget, int /*long*/ iter1, int /*long*/ iter2) {
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     GtkTextIter startIter = *cast(GtkTextIter*)iter1;
     GtkTextIter endIter = *cast(GtkTextIter*)iter2;
     int start = OS.gtk_text_iter_get_offset (&startIter);
@@ -1188,7 +1188,7 @@
 }
 
 override int /*long*/ gtk_delete_text (GtkWidget* widget, int /*long*/ start_pos, int /*long*/ end_pos) {
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     char[] newText = verifyText ("", cast(int)/*64*/start_pos, cast(int)/*64*/end_pos);
     if (newText is null) {
         /* Remember the selection when the text was deleted */
@@ -1222,7 +1222,7 @@
     * its focus in processing so that other widgets (such as the combo)
     * use the correct value.
     */
-    if ((style & SWT.SINGLE) !is 0 && display.entrySelectOnFocus) {
+    if ((style & DWT.SINGLE) !is 0 && display.entrySelectOnFocus) {
         switch (event.type) {
             case OS.GDK_FOCUS_CHANGE:
                 GdkEventFocus* gdkEventFocus = cast(GdkEventFocus*)event;
@@ -1251,7 +1251,7 @@
     * this property when a GtkEntry is given focus and restore it after
     * the entry has done focus in processing.
     */
-    if ((style & SWT.SINGLE) !is 0 && display.entrySelectOnFocus) {
+    if ((style & DWT.SINGLE) !is 0 && display.entrySelectOnFocus) {
         auto settings = OS.gtk_settings_get_default ();
         OS.g_object_set1 (settings, OS.gtk_entry_select_on_focus.ptr, false );
     }
@@ -1259,7 +1259,7 @@
 }
 
 override int /*long*/ gtk_insert_text (GtkEditable* widget, char* new_text, int new_text_length, int position) {
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     if (new_text is null || new_text_length is 0) return 0;
     char[] oldText = (cast(char*)new_text)[ 0 .. new_text_length ].dup;
     int pos;
@@ -1312,7 +1312,7 @@
 }
 
 override int /*long*/ gtk_text_buffer_insert_text (GtkTextBuffer *widget, GtkTextIter *iter, char *text, int len) {
-    if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+    if (!hooks (DWT.Verify) && !filters (DWT.Verify)) return 0;
     GtkTextIter position = *iter;
     /* Use the selection when the text was deleted */
     int start = OS.gtk_text_iter_get_offset (&position), end = start;
@@ -1338,7 +1338,7 @@
 
 override void hookEvents () {
     super.hookEvents();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.g_signal_connect_closure (handle, OS.changed.ptr, display.closures [CHANGED], true);
         OS.g_signal_connect_closure (handle, OS.insert_text.ptr, display.closures [INSERT_TEXT], false);
         OS.g_signal_connect_closure (handle, OS.delete_text.ptr, display.closures [DELETE_TEXT], false);
@@ -1359,7 +1359,7 @@
 }
 
 GtkIMContext* imContext () {
-    return (style & SWT.SINGLE) !is 0 ? OS.GTK_ENTRY_IM_CONTEXT (cast(GtkEntry*)handle) : OS.GTK_TEXTVIEW_IM_CONTEXT (cast(GtkTextView*)handle);
+    return (style & DWT.SINGLE) !is 0 ? OS.GTK_ENTRY_IM_CONTEXT (cast(GtkEntry*)handle) : OS.GTK_TEXTVIEW_IM_CONTEXT (cast(GtkTextView*)handle);
 }
 
 /**
@@ -1373,15 +1373,15 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is <code>null</code></li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 insert (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if ((style & SWT.SINGLE) !is 0) {
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if ((style & DWT.SINGLE) !is 0) {
         int start, end;
         OS.gtk_editable_get_selection_bounds (cast(GtkEditable*)handle, &start, &end);
         OS.gtk_editable_delete_selection (cast(GtkEditable*)handle);
@@ -1401,7 +1401,7 @@
 }
 
 override GdkDrawable* paintWindow () {
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         auto window = super.paintWindow ();
         auto children = OS.gdk_window_get_children (window);
         if (children !is null) window = cast(GdkDrawable*) OS.g_list_data (children);
@@ -1419,14 +1419,14 @@
  * and new text inserted from the clipboard.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 paste () {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_paste_clipboard (cast(GtkEditable*)handle);
     } else {
         auto clipboard = OS.gtk_clipboard_get (cast(void*)OS.GDK_NONE);
@@ -1451,7 +1451,7 @@
         * the widget is being destroyed to reference the text buffer, keeping
         * it around until ownership of the clipboard is lost.
         */
-        if ((style & SWT.MULTI) !is 0) {
+        if ((style & DWT.MULTI) !is 0) {
             auto clipboard = OS.gtk_clipboard_get (cast(void*)OS.GDK_NONE);
             OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (cast(GtkTextView*)handle));
         }
@@ -1468,7 +1468,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1478,9 +1478,9 @@
  */
 public void removeModifyListener (ModifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Modify, listener);
+    eventTable.unhook (DWT.Modify, listener);
 }
 
 /**
@@ -1492,7 +1492,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1502,10 +1502,10 @@
  */
 public void removeSelectionListener(SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook(SWT.Selection, listener);
-    eventTable.unhook(SWT.DefaultSelection,listener);
+    eventTable.unhook(DWT.Selection, listener);
+    eventTable.unhook(DWT.DefaultSelection,listener);
 }
 
 /**
@@ -1517,7 +1517,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1527,22 +1527,22 @@
  */
 public void removeVerifyListener (VerifyListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Verify, listener);
+    eventTable.unhook (DWT.Verify, listener);
 }
 
 /**
  * Selects all the text in the receiver.
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_select_region (cast(GtkEditable*)handle, 0, -1);
     } else {
         GtkTextIter start;
@@ -1581,7 +1581,7 @@
  *
  * @param doubleClick the new double click flag
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1607,14 +1607,14 @@
  *
  * @param echo the new echo character
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setEchoChar (char echo) {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_entry_set_visibility (cast(GtkEntry*)handle, echo is '\0');
         OS.gtk_entry_set_invisible_char (cast(GtkEntry*)handle, echo);
     }
@@ -1625,16 +1625,16 @@
  *
  * @param editable the new editable state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setEditable (bool editable) {
     checkWidget ();
-    style &= ~SWT.READ_ONLY;
-    if (!editable) style |= SWT.READ_ONLY;
-    if ((style & SWT.SINGLE) !is 0) {
+    style &= ~DWT.READ_ONLY;
+    if (!editable) style |= DWT.READ_ONLY;
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_set_editable (cast(GtkEditable*)handle, editable);
     } else {
         OS.gtk_text_view_set_editable (cast(GtkTextView*)handle, editable);
@@ -1648,7 +1648,7 @@
 
 /**
  * Sets the widget message. When the widget is created
- * with the style <code>SWT.SEARCH</code>, the message text
+ * with the style <code>DWT.SEARCH</code>, the message text
  * is displayed as a hint for the user, indicating the
  * purpose of the field.
  * <p>
@@ -1661,7 +1661,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the message is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1670,13 +1670,13 @@
  */
 public void setMessage (char[] message) {
     checkWidget ();
-    if (message is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (message is null) error (DWT.ERROR_NULL_ARGUMENT);
     this.message = message;
 }
 
 /**
  * Sets the orientation of the receiver, which must be one
- * of the constants <code>SWT.LEFT_TO_RIGHT</code> or <code>SWT.RIGHT_TO_LEFT</code>.
+ * of the constants <code>DWT.LEFT_TO_RIGHT</code> or <code>DWT.RIGHT_TO_LEFT</code>.
  * <p>
  * Note: This operation is a hint and is not supported on
  * platforms that do not have this concept.
@@ -1684,7 +1684,7 @@
  *
  * @param orientation new orientation style
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1713,14 +1713,14 @@
  *
  * @param start new caret position
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (int start) {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_set_position (cast(GtkEditable*)handle, start);
     } else {
         GtkTextIter position;
@@ -1751,14 +1751,14 @@
  * @param start the start of the range
  * @param end the end of the range
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (int start, int end) {
     checkWidget ();
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.gtk_editable_set_position (cast(GtkEditable*)handle, start);
         OS.gtk_editable_select_region (cast(GtkEditable*)handle, start, end);
     } else {
@@ -1797,14 +1797,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (selection is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (selection is null) error (DWT.ERROR_NULL_ARGUMENT);
     setSelection (selection.x, selection.y);
 }
 
@@ -1819,7 +1819,7 @@
  * @param tabs the number of tabs
  *
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1831,7 +1831,7 @@
 }
 
 void setTabStops (int tabs) {
-    if ((style & SWT.SINGLE) !is 0) return;
+    if ((style & DWT.SINGLE) !is 0) return;
     int tabWidth = getTabWidth (tabs);
     auto tabArray = OS.pango_tab_array_new (1, false);
     OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
@@ -1849,24 +1849,24 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     /*
     * Feature in gtk.  When text is set in gtk, separate events are fired for the deletion and
     * insertion of the text.  This is not wrong, but is inconsistent with other platforms.  The
     * fix is to block the firing of these events and fire them ourselves in a consistent manner.
     */
-    if (hooks (SWT.Verify) || filters (SWT.Verify)) {
+    if (hooks (DWT.Verify) || filters (DWT.Verify)) {
         string = verifyText (string, 0, getCharCount ());
         if (string is null) return;
     }
-    if ((style & SWT.SINGLE) !is 0) {
+    if ((style & DWT.SINGLE) !is 0) {
         OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udCHANGED);
         OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udDELETE_TEXT);
         OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, udINSERT_TEXT);
@@ -1888,7 +1888,7 @@
         auto mark = OS.gtk_text_buffer_get_insert (bufferHandle);
         OS.gtk_text_view_scroll_mark_onscreen (cast(GtkTextView*)handle, mark);
     }
-    sendEvent (SWT.Modify);
+    sendEvent (DWT.Modify);
 }
 
 /**
@@ -1908,7 +1908,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1917,8 +1917,8 @@
  */
 public void setTextLimit (int limit) {
     checkWidget ();
-    if (limit is 0) error (SWT.ERROR_CANNOT_BE_ZERO);
-    if ((style & SWT.SINGLE) !is 0) OS.gtk_entry_set_max_length (cast(GtkEntry*)handle, limit);
+    if (limit is 0) error (DWT.ERROR_CANNOT_BE_ZERO);
+    if ((style & DWT.SINGLE) !is 0) OS.gtk_entry_set_max_length (cast(GtkEntry*)handle, limit);
 }
 
 /**
@@ -1928,14 +1928,14 @@
  *
  * @param index the index of the top item
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SINGLE) !is 0) return;
+    if ((style & DWT.SINGLE) !is 0) return;
     GtkTextIter position;
     OS.gtk_text_buffer_get_iter_at_line (bufferHandle, &position, index);
     OS.gtk_text_view_scroll_to_iter (cast(GtkTextView*)handle, &position, 0, true, 0, 0);
@@ -1949,14 +1949,14 @@
  * lines are scrolled until the selection is visible.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if ((style & SWT.SINGLE) !is 0) return;
+    if ((style & DWT.SINGLE) !is 0) return;
     auto mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
     OS.gtk_text_view_scroll_mark_onscreen (cast(GtkTextView*)handle, mark);
     mark = OS.gtk_text_buffer_get_insert (bufferHandle);
@@ -1986,13 +1986,13 @@
 
 int traversalCode (int key, GdkEventKey* event) {
     int bits = super.traversalCode (key, event);
-    if ((style & SWT.READ_ONLY) !is 0)  return bits;
-    if ((style & SWT.MULTI) !is 0) {
-        bits &= ~SWT.TRAVERSE_RETURN;
+    if ((style & DWT.READ_ONLY) !is 0)  return bits;
+    if ((style & DWT.MULTI) !is 0) {
+        bits &= ~DWT.TRAVERSE_RETURN;
         if (key is OS.GDK_Tab && event !is null) {
             bool next = (event.state & OS.GDK_SHIFT_MASK) is 0;
             if (next && (event.state & OS.GDK_CONTROL_MASK) is 0) {
-                bits &= ~(SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS);
+                bits &= ~(DWT.TRAVERSE_TAB_NEXT | DWT.TRAVERSE_TAB_PREVIOUS);
             }
         }
     }
@@ -2022,7 +2022,7 @@
      * event.  If this happens, answer null to cancel
      * the operation.
      */
-    sendEvent (SWT.Verify, event);
+    sendEvent (DWT.Verify, event);
     if (!event.doit || isDisposed ()) return null;
     return event.text;
 }
--- a/dwt/widgets/ToolTip.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/ToolTip.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 import dwt.widgets.Widget;
 import dwt.widgets.TrayItem;
 import dwt.widgets.Shell;
-import dwt.SWT;
+import dwt.DWT;
 //import dwt.internal.*;
 import dwt.internal.gtk.OS;
 import dwt.graphics.Point;
@@ -41,7 +41,7 @@
  * and ICON_WARNING may be specified.
  * </p><p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation.
+ * within the DWT implementation.
  * </p>
  *
  * @since 3.2
@@ -68,10 +68,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -82,14 +82,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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#ICON_ERROR
- * @see SWT#ICON_INFORMATION
- * @see SWT#ICON_WARNING
+ * @see DWT#ICON_ERROR
+ * @see DWT#ICON_INFORMATION
+ * @see DWT#ICON_WARNING
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -100,9 +100,9 @@
 }
 
 static int checkStyle (int style) {
-    int mask = SWT.ICON_ERROR | SWT.ICON_INFORMATION | SWT.ICON_WARNING;
+    int mask = DWT.ICON_ERROR | DWT.ICON_INFORMATION | DWT.ICON_WARNING;
     if ((style & mask) is 0) return style;
-    return checkBits (style, SWT.ICON_INFORMATION, SWT.ICON_WARNING, SWT.ICON_ERROR, 0, 0, 0);
+    return checkBits (style, DWT.ICON_INFORMATION, DWT.ICON_WARNING, DWT.ICON_ERROR, 0, 0, 0);
 }
 
 /**
@@ -120,7 +120,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -131,10 +131,10 @@
  */
 public void addSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection,typedListener);
-    addListener (SWT.DefaultSelection,typedListener);
+    addListener (DWT.Selection,typedListener);
+    addListener (DWT.DefaultSelection,typedListener);
 }
 
 void configure () {
@@ -232,14 +232,14 @@
 
 void createHandle (int index) {
     state |= HANDLE;
-    if ((style & SWT.BALLOON) !is 0) {
+    if ((style & DWT.BALLOON) !is 0) {
         handle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
-        Color background = display.getSystemColor (SWT.COLOR_INFO_BACKGROUND);
+        Color background = display.getSystemColor (DWT.COLOR_INFO_BACKGROUND);
         OS.gtk_widget_modify_bg (handle, OS.GTK_STATE_NORMAL, background.handle);
         OS.gtk_widget_set_app_paintable (handle, true);
     } else {
         handle = cast(GtkWidget*)OS.gtk_tooltips_new ();
-        if (handle is null) SWT.error (SWT.ERROR_NO_HANDLES);
+        if (handle is null) DWT.error (DWT.ERROR_NO_HANDLES);
         /*
         * Bug in Solaris-GTK.  Invoking gtk_tooltips_force_window()
         * can cause a crash in older versions of GTK.  The fix is
@@ -263,7 +263,7 @@
 
 void deregister () {
     super.deregister ();
-    if ((style & SWT.BALLOON) is 0) {
+    if ((style & DWT.BALLOON) is 0) {
         auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
         if (tipWindow !is null) display.removeWidget (tipWindow);
     }
@@ -273,7 +273,7 @@
     auto topHandle = topHandle ();
     releaseHandle ();
     if (topHandle !is null && (state & HANDLE) !is 0) {
-        if ((style & SWT.BALLOON) !is 0) {
+        if ((style & DWT.BALLOON) !is 0) {
             OS.gtk_widget_destroy (topHandle);
         } else {
             OS.g_object_unref (topHandle);
@@ -287,7 +287,7 @@
  *
  * @return the receiver's auto hide state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -325,7 +325,7 @@
  *
  * @return the receiver's message
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -344,7 +344,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -368,7 +368,7 @@
         messageWidth = OS.PANGO_PIXELS (w );
     }
     int messageTrim = 2 * INSET + 2 * BORDER + 2 * PADDING;
-    bool hasImage = layoutText !is null && (style & (SWT.ICON_ERROR | SWT.ICON_INFORMATION | SWT.ICON_WARNING)) !is 0;
+    bool hasImage = layoutText !is null && (style & (DWT.ICON_ERROR | DWT.ICON_INFORMATION | DWT.ICON_WARNING)) !is 0;
     int textTrim = messageTrim + (hasImage ? IMAGE_SIZE : 0);
     int width = Math.min (maxWidth, Math.max (textWidth + textTrim, messageWidth + messageTrim));
     int textHeight = 0, messageHeight = 0;
@@ -393,7 +393,7 @@
  *
  * @return the receiver's text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -415,20 +415,20 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 bool getVisible () {
     checkWidget ();
-    if ((style & SWT.BALLOON) !is 0) return OS.GTK_WIDGET_VISIBLE (handle);
+    if ((style & DWT.BALLOON) !is 0) return OS.GTK_WIDGET_VISIBLE (handle);
     auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
     return OS.GTK_WIDGET_VISIBLE (tipWindow);
 }
 
 override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
-    notifyListeners (SWT.Selection, new Event ());
+    notifyListeners (DWT.Selection, new Event ());
     setVisible (false);
     return 0;
 }
@@ -442,11 +442,11 @@
     if (spikeAbove) y += TIP_HEIGHT;
     if (layoutText !is null) {
         char[] buffer = null;
-        int id = style & (SWT.ICON_ERROR | SWT.ICON_INFORMATION | SWT.ICON_WARNING);
+        int id = style & (DWT.ICON_ERROR | DWT.ICON_INFORMATION | DWT.ICON_WARNING);
         switch (id) {
-            case SWT.ICON_ERROR: buffer = "gtk-dialog-error"; break;
-            case SWT.ICON_INFORMATION: buffer = "gtk-dialog-info"; break;
-            case SWT.ICON_WARNING: buffer = "gtk-dialog-warning"; break;
+            case DWT.ICON_ERROR: buffer = "gtk-dialog-error"; break;
+            case DWT.ICON_INFORMATION: buffer = "gtk-dialog-info"; break;
+            case DWT.ICON_WARNING: buffer = "gtk-dialog-warning"; break;
             default:
         }
         if (buffer !is null) {
@@ -495,7 +495,7 @@
 }
 
 void hookEvents () {
-    if ((style & SWT.BALLOON) !is 0) {
+    if ((style & DWT.BALLOON) !is 0) {
         OS.g_signal_connect_closure (handle, OS.expose_event.ptr, display.closures [EXPOSE_EVENT], false);
         OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);
         OS.g_signal_connect_closure (handle, OS.button_press_event.ptr, display.closures [BUTTON_PRESS_EVENT], false);
@@ -516,7 +516,7 @@
  *
  * @return the receiver's visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -530,7 +530,7 @@
 
 void register () {
     super.register ();
-    if ((style & SWT.BALLOON) is 0) {
+    if ((style & DWT.BALLOON) is 0) {
         auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
         if (tipWindow !is null) display.addWidget (tipWindow, this);
     }
@@ -558,7 +558,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -568,10 +568,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection, listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection, listener);
 }
 
 /**
@@ -580,7 +580,7 @@
  *
  * @param autoHide the auto hide state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -606,7 +606,7 @@
  * @param x the new x coordinate for the receiver
  * @param y the new y coordinate for the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -615,7 +615,7 @@
     checkWidget ();
     this.x = x;
     this.y = y;
-    if ((style & SWT.BALLOON) !is 0) {
+    if ((style & DWT.BALLOON) !is 0) {
         if (OS.GTK_WIDGET_VISIBLE (handle)) configure ();
     } else {
         auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
@@ -642,14 +642,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (location is null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+    if (location is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
     setLocation (location.x, location.y);
 }
 
@@ -661,16 +661,16 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 setMessage (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     message = string;
-    if ((style & SWT.BALLOON) is 0) return;
+    if ((style & DWT.BALLOON) is 0) return;
     if (layoutMessage !is null) OS.g_object_unref (layoutMessage);
     layoutMessage = null;
     if (message.length !is 0) {
@@ -688,16 +688,16 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 (char[] string) {
     checkWidget ();
-    if (string is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
     text = string;
-    if ((style & SWT.BALLOON) is 0) return;
+    if ((style & DWT.BALLOON) is 0) return;
     if (layoutText !is null) OS.g_object_unref (layoutText);
     layoutText = null;
     if (text.length !is 0) {
@@ -725,7 +725,7 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -734,7 +734,7 @@
     if (timerId !is 0) OS.gtk_timeout_remove(timerId);
     timerId = 0;
     if (visible) {
-        if ((style & SWT.BALLOON) !is 0) {
+        if ((style & DWT.BALLOON) !is 0) {
             configure ();
             OS.gtk_widget_show (handle);
         } else {
@@ -750,7 +750,7 @@
         }
         if (autohide) timerId = display.doWindowTimerAdd( &timerProcCallbackData, DELAY, handle);
     } else {
-        if ((style & SWT.BALLOON) !is 0) {
+        if ((style & DWT.BALLOON) !is 0) {
             OS.gtk_widget_hide (handle);
         } else {
             auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
@@ -760,7 +760,7 @@
 }
 
 override int /*long*/ timerProc (GtkWidget* widget) {
-    if ((style & SWT.BALLOON) !is 0) {
+    if ((style & DWT.BALLOON) !is 0) {
         OS.gtk_widget_hide (handle);
     } else {
         auto tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (cast(GtkTooltips*)handle);
--- a/dwt/widgets/Tray.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Tray.d	Tue Jan 15 06:44:34 2008 +0100
@@ -13,7 +13,7 @@
 import dwt.widgets.Display;
 import dwt.widgets.Widget;
 import dwt.widgets.TrayItem;
-import dwt.SWT;
+import dwt.DWT;
 import dwt.dwthelper.System;
 
 /**
@@ -43,13 +43,13 @@
     if (display is null) display = Display.getCurrent ();
     if (display is null) display = Display.getDefault ();
     if (!display.isValidThread ()) {
-        error (SWT.ERROR_THREAD_INVALID_ACCESS);
+        error (DWT.ERROR_THREAD_INVALID_ACCESS);
     }
     this.display = display;
 }
 
 void createItem (TrayItem item, int index) {
-    if (!(0 <= index && index <= itemCount)) error (SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= index && index <= itemCount)) error (DWT.ERROR_INVALID_RANGE);
     if (itemCount is items.length) {
         TrayItem [] newItems = new TrayItem [items.length + 4];
         System.arraycopy (items, 0, newItems, 0, items.length);
@@ -80,14 +80,14 @@
  * @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>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 TrayItem getItem (int index) {
     checkWidget ();
-    if (!(0 <= index && index < itemCount)) error (SWT.ERROR_INVALID_RANGE);
+    if (!(0 <= index && index < itemCount)) error (DWT.ERROR_INVALID_RANGE);
     return items [index];
 }
 
@@ -96,7 +96,7 @@
  *
  * @return the number of items
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -117,7 +117,7 @@
  *
  * @return the items in the receiver
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
--- a/dwt/widgets/TrayItem.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/TrayItem.d	Tue Jan 15 06:44:34 2008 +0100
@@ -10,7 +10,7 @@
  *******************************************************************************/
 module dwt.widgets.TrayItem;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.widgets.Tray;
 import dwt.widgets.ToolTip;
 import dwt.widgets.ImageList;
@@ -59,10 +59,10 @@
  * to the end of the items maintained by its parent.
  * <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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -73,12 +73,12 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT
  * @see Widget#checkSubclass
  * @see Widget#getStyle
  */
@@ -99,7 +99,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -111,9 +111,9 @@
  */
 public void addMenuDetectListener (MenuDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.MenuDetect, typedListener);
+    addListener (DWT.MenuDetect, typedListener);
 }
 
 /**
@@ -131,7 +131,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -142,14 +142,14 @@
  */
 public void addSelectionListener(SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Selection, typedListener);
-    addListener (SWT.DefaultSelection, typedListener);
+    addListener (DWT.Selection, typedListener);
+    addListener (DWT.DefaultSelection, typedListener);
 }
 
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 void createWidget (int index) {
@@ -160,9 +160,9 @@
 void createHandle (int index) {
     state |= HANDLE;
     handle = OS.gtk_plug_new (0);
-    if (handle is null) error (SWT.ERROR_NO_HANDLES);
+    if (handle is null) error (DWT.ERROR_NO_HANDLES);
     imageHandle = OS.gtk_image_new ();
-    if (imageHandle is null) error (SWT.ERROR_NO_HANDLES);
+    if (imageHandle is null) error (DWT.ERROR_NO_HANDLES);
     OS.gtk_container_add (cast(GtkContainer*)handle, imageHandle);
     OS.gtk_widget_show (handle);
     OS.gtk_widget_show (imageHandle);
@@ -205,7 +205,7 @@
  *
  * @return the receiver's parent
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -223,7 +223,7 @@
  *
  * @return the receiver's tool tip text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -241,7 +241,7 @@
  *
  * @return the receiver's tool tip text
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -254,13 +254,13 @@
 override int /*long*/ gtk_button_press_event (GtkWidget* widget, GdkEventButton* event) {
     if (event.type is OS.GDK_3BUTTON_PRESS) return 0;
     if (event.button is 3 && event.type is OS.GDK_BUTTON_PRESS) {
-        sendEvent (SWT.MenuDetect);
+        sendEvent (DWT.MenuDetect);
         return 0;
     }
     if (event.type is OS.GDK_2BUTTON_PRESS) {
-        postEvent (SWT.DefaultSelection);
+        postEvent (DWT.DefaultSelection);
     } else {
-        postEvent (SWT.Selection);
+        postEvent (DWT.Selection);
     }
     return 0;
 }
@@ -272,7 +272,7 @@
             int yoffset = cast(int) Math.floor (OS.GTK_WIDGET_Y (widget) + ((OS.GTK_WIDGET_HEIGHT (widget) - OS.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5);
             Rectangle b = image.getBounds();
             auto gdkImage = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
-            if (gdkImage is null) SWT.error(SWT.ERROR_NO_HANDLES);
+            if (gdkImage is null) DWT.error(DWT.ERROR_NO_HANDLES);
             byte[] maskData = (cast(byte*)gdkImage.mem)[ 0 .. gdkImage.bpl * gdkImage.height].dup;
             Region region = new Region (display);
             for (int y = 0; y < b.height; y++) {
@@ -308,7 +308,7 @@
  *
  * @return the receiver's visibility
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -349,7 +349,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -361,9 +361,9 @@
  */
 public void removeMenuDetectListener (MenuDetectListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.MenuDetect, listener);
+    eventTable.unhook (DWT.MenuDetect, listener);
 }
 
 /**
@@ -375,7 +375,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -385,10 +385,10 @@
  */
 public void removeSelectionListener (SelectionListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Selection, listener);
-    eventTable.unhook (SWT.DefaultSelection, listener);
+    eventTable.unhook (DWT.Selection, listener);
+    eventTable.unhook (DWT.DefaultSelection, listener);
 }
 
 /**
@@ -399,14 +399,14 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if the image has been disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 ();
-    if (image !is null && image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (image !is null && image.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
     this.image = image;
     if (image !is null) {
         Rectangle rect = image.getBounds ();
@@ -434,7 +434,7 @@
  *
  * @param toolTip the new tool tip (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -455,7 +455,7 @@
  *
  * @param value the new tool tip text (or null)
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -469,7 +469,7 @@
     }
     if (tooltipsHandle is null) {
         tooltipsHandle = cast(GtkWidget*)OS.gtk_tooltips_new ();
-        if (tooltipsHandle is null) error (SWT.ERROR_NO_HANDLES);
+        if (tooltipsHandle is null) error (DWT.ERROR_NO_HANDLES);
         OS.g_object_ref (cast(GObject*)tooltipsHandle);
         OS.gtk_object_sink (cast(GtkObject*)tooltipsHandle);
     }
@@ -482,7 +482,7 @@
  *
  * @param visible the new visibility state
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -496,12 +496,12 @@
         * code could have disposed the widget in the show
         * event.  If this happens, just return.
         */
-        sendEvent (SWT.Show);
+        sendEvent (DWT.Show);
         if (isDisposed ()) return;
         OS.gtk_widget_show (handle);
     } else {
         OS.gtk_widget_hide (handle);
-        sendEvent (SWT.Hide);
+        sendEvent (DWT.Hide);
     }
 }
 }
--- a/dwt/widgets/TypedListener.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/TypedListener.d	Tue Jan 15 06:44:34 2008 +0100
@@ -11,8 +11,8 @@
 module dwt.widgets.TypedListener;
 
 
-import dwt.internal.SWTEventListener;
-import dwt.SWT;
+import dwt.internal.DWTEventListener;
+import dwt.DWT;
 import dwt.widgets.Listener;
 import dwt.widgets.Event;
 import dwt.events.ArmEvent;
@@ -58,13 +58,13 @@
 
 
 /**
- * Instances of this class are <em>internal SWT implementation</em>
+ * Instances of this class are <em>internal DWT implementation</em>
  * objects which provide a mapping between the typed and untyped
- * listener mechanisms that SWT supports.
+ * listener mechanisms that DWT supports.
  * <p>
- * <b>IMPORTANT:</b> This class is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This class is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  *
@@ -75,66 +75,66 @@
     /**
      * The receiver's event listener
      */
-    protected SWTEventListener eventListener;
+    protected DWTEventListener eventListener;
 
 /**
  * Constructs a new instance of this class for the given event listener.
  * <p>
- * <b>IMPORTANT:</b> This method is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  *
  * @param listener the event listener to store in the receiver
  */
-public this (SWTEventListener listener) {
+public this (DWTEventListener listener) {
     eventListener = listener;
 }
 
 /**
  * Returns the receiver's event listener.
  * <p>
- * <b>IMPORTANT:</b> This method is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  *
  * @return the receiver's event listener
  */
-public SWTEventListener getEventListener () {
+public DWTEventListener getEventListener () {
     return eventListener;
 }
 
 /**
  * Handles the given event.
  * <p>
- * <b>IMPORTANT:</b> This method is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  * @param e the event to handle
  */
 public void handleEvent (Event e) {
     switch (e.type) {
-        case SWT.Activate: {
+        case DWT.Activate: {
             (cast(ShellListener) eventListener).shellActivated(new ShellEvent(e));
             break;
         }
-        case SWT.Arm: {
+        case DWT.Arm: {
             (cast(ArmListener) eventListener).widgetArmed (new ArmEvent (e));
             break;
         }
-        case SWT.Close: {
+        case DWT.Close: {
             /* Fields set by Decorations */
             ShellEvent event = new ShellEvent (e);
             (cast(ShellListener) eventListener).shellClosed(event);
             e.doit = event.doit;
             break;
         }
-        case SWT.Collapse: {
+        case DWT.Collapse: {
             if ( auto l = cast(TreeListener)eventListener ) {
                 l.treeCollapsed(new TreeEvent(e));
             } else {
@@ -142,27 +142,27 @@
             }
             break;
         }
-        case SWT.Deactivate: {
+        case DWT.Deactivate: {
             (cast(ShellListener) eventListener).shellDeactivated(new ShellEvent(e));
             break;
         }
-        case SWT.Deiconify: {
+        case DWT.Deiconify: {
             (cast(ShellListener) eventListener).shellDeiconified(new ShellEvent(e));
             break;
         }
-        case SWT.DefaultSelection: {
+        case DWT.DefaultSelection: {
             (cast(SelectionListener)eventListener).widgetDefaultSelected(new SelectionEvent(e));
             break;
         }
-        case SWT.Dispose: {
+        case DWT.Dispose: {
             (cast(DisposeListener) eventListener).widgetDisposed(new DisposeEvent(e));
             break;
         }
-        case SWT.DragDetect: {
+        case DWT.DragDetect: {
             (cast(DragDetectListener) eventListener).dragDetected(new DragDetectEvent(e));
             break;
         }
-        case SWT.Expand: {
+        case DWT.Expand: {
             if (auto l = cast(TreeListener)eventListener ) {
                 l.treeExpanded(new TreeEvent(e));
             } else {
@@ -170,45 +170,45 @@
             }
             break;
         }
-        case SWT.FocusIn: {
+        case DWT.FocusIn: {
             (cast(FocusListener) eventListener).focusGained(new FocusEvent(e));
             break;
         }
-        case SWT.FocusOut: {
+        case DWT.FocusOut: {
             (cast(FocusListener) eventListener).focusLost(new FocusEvent(e));
             break;
         }
-        case SWT.Help: {
+        case DWT.Help: {
             (cast(HelpListener) eventListener).helpRequested (new HelpEvent (e));
             break;
         }
-        case SWT.Hide: {
+        case DWT.Hide: {
             (cast(MenuListener) eventListener).menuHidden(new MenuEvent(e));
             break;
         }
-        case SWT.Iconify: {
+        case DWT.Iconify: {
             (cast(ShellListener) eventListener).shellIconified(new ShellEvent(e));
             break;
         }
-        case SWT.KeyDown: {
+        case DWT.KeyDown: {
             /* Fields set by Control */
             KeyEvent event = new KeyEvent(e);
             (cast(KeyListener) eventListener).keyPressed(event);
             e.doit = event.doit;
             break;
         }
-        case SWT.KeyUp: {
+        case DWT.KeyUp: {
             /* Fields set by Control */
             KeyEvent event = new KeyEvent(e);
             (cast(KeyListener) eventListener).keyReleased(event);
             e.doit = event.doit;
             break;
         }
-        case SWT.Modify: {
+        case DWT.Modify: {
             (cast(ModifyListener) eventListener).modifyText(new ModifyEvent(e));
             break;
         }
-        case SWT.MenuDetect: {
+        case DWT.MenuDetect: {
             MenuDetectEvent event = new MenuDetectEvent(e);
             (cast(MenuDetectListener) eventListener).menuDetected(event);
             e.x = event.x;
@@ -216,54 +216,54 @@
             e.doit = event.doit;
             break;
         }
-        case SWT.MouseDown: {
+        case DWT.MouseDown: {
             (cast(MouseListener) eventListener).mouseDown(new MouseEvent(e));
             break;
         }
-        case SWT.MouseDoubleClick: {
+        case DWT.MouseDoubleClick: {
             (cast(MouseListener) eventListener).mouseDoubleClick(new MouseEvent(e));
             break;
         }
-        case SWT.MouseEnter: {
+        case DWT.MouseEnter: {
             (cast(MouseTrackListener) eventListener).mouseEnter (new MouseEvent (e));
             break;
         }
-        case SWT.MouseExit: {
+        case DWT.MouseExit: {
             (cast(MouseTrackListener) eventListener).mouseExit (new MouseEvent (e));
             break;
         }
-        case SWT.MouseHover: {
+        case DWT.MouseHover: {
             (cast(MouseTrackListener) eventListener).mouseHover (new MouseEvent (e));
             break;
         }
-        case SWT.MouseMove: {
+        case DWT.MouseMove: {
             (cast(MouseMoveListener) eventListener).mouseMove(new MouseEvent(e));
             return;
         }
-        case SWT.MouseWheel: {
+        case DWT.MouseWheel: {
             (cast(MouseWheelListener) eventListener).mouseScrolled(new MouseEvent(e));
             return;
         }
-        case SWT.MouseUp: {
+        case DWT.MouseUp: {
             (cast(MouseListener) eventListener).mouseUp(new MouseEvent(e));
             break;
         }
-        case SWT.Move: {
+        case DWT.Move: {
             (cast(ControlListener) eventListener).controlMoved(new ControlEvent(e));
             break;
         }
-        case SWT.Paint: {
+        case DWT.Paint: {
             /* Fields set by Control */
             PaintEvent event = new PaintEvent (e);
             (cast(PaintListener) eventListener).paintControl (event);
             e.gc = event.gc;
             break;
         }
-        case SWT.Resize: {
+        case DWT.Resize: {
             (cast(ControlListener) eventListener).controlResized(new ControlEvent(e));
             break;
         }
-        case SWT.Selection: {
+        case DWT.Selection: {
             /* Fields set by Sash */
             SelectionEvent event = new SelectionEvent (e);
             (cast(SelectionListener) eventListener).widgetSelected (event);
@@ -272,11 +272,11 @@
             e.doit = event.doit;
             break;
         }
-        case SWT.Show: {
+        case DWT.Show: {
             (cast(MenuListener) eventListener).menuShown(new MenuEvent(e));
             break;
         }
-        case SWT.Traverse: {
+        case DWT.Traverse: {
             /* Fields set by Control */
             TraverseEvent event = new TraverseEvent (e);
             (cast(TraverseListener) eventListener).keyTraversed (event);
@@ -284,7 +284,7 @@
             e.doit = event.doit;
             break;
         }
-        case SWT.Verify: {
+        case DWT.Verify: {
             /* Fields set by Text, RichText */
             VerifyEvent event = new VerifyEvent (e);
             (cast(VerifyListener) eventListener).verifyText (event);
--- a/dwt/widgets/Widget.d	Tue Jan 15 06:38:45 2008 +0100
+++ b/dwt/widgets/Widget.d	Tue Jan 15 06:44:34 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,12 +10,12 @@
  *******************************************************************************/
 module dwt.widgets.Widget;
 
-import dwt.SWT;
+import dwt.DWT;
 import dwt.dwthelper.utils;
 
 import dwt.events.DisposeListener;
 import dwt.internal.Converter;
-import dwt.internal.SWTEventListener;
+import dwt.internal.DWTEventListener;
 import dwt.internal.gtk.OS;
 import dwt.widgets.Display;
 import dwt.widgets.Event;
@@ -44,8 +44,8 @@
  * </dl>
  * <p>
  * IMPORTANT: This class is intended to be subclassed <em>only</em>
- * within the SWT implementation. However, it has not been marked
- * final to allow those outside of the SWT development team to implement
+ * within the DWT implementation. However, it has not been marked
+ * final to allow those outside of the DWT development team to implement
  * patched versions of the class in order to get around specific
  * limitations in advance of when those limitations can be addressed
  * by the team.  Any class built using subclassing to access the internals
@@ -63,9 +63,9 @@
      * the handle to the OS resource
      * (Warning: This field is platform dependent)
      * <p>
-     * <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
+     * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
      * public API. It is marked public only so that it can be shared
-     * within the packages provided by SWT. It is not available on all
+     * within the packages provided by DWT. It is not available on all
      * platforms and should never be accessed from application code.
      * </p>
      */
@@ -254,10 +254,10 @@
  * 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 <code>DWT</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
+ * of those <code>DWT</code> style constants. The class description
  * lists the style constants that are applicable to the class.
  * Style bits are also inherited from superclasses.
  * </p>
@@ -269,12 +269,12 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parent is disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <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 DWT
  * @see #checkSubclass
  * @see #getStyle
  */
@@ -295,7 +295,7 @@
  * be notified when an event of the given type occurs. When the
  * event does occur in the widget, the listener is notified by
  * sending it the <code>handleEvent()</code> message. The event
- * type is one of the event constants defined in class <code>SWT</code>.
+ * type is one of the event constants defined in class <code>DWT</code>.
  *
  * @param eventType the type of event to listen for
  * @param listener the listener which should be notified when the event occurs
@@ -303,19 +303,19 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 Listener
- * @see SWT
+ * @see DWT
  * @see #removeListener(int, Listener)
  * @see #notifyListeners
  */
 public void addListener (int eventType, Listener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     _addListener (eventType, listener);
 }
 
@@ -330,7 +330,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -340,9 +340,9 @@
  */
 public void addDisposeListener (DisposeListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     TypedListener typedListener = new TypedListener (listener);
-    addListener (SWT.Dispose, typedListener);
+    addListener (DWT.Dispose, typedListener);
 }
 
 GdkWindow* paintWindow () {
@@ -370,14 +370,14 @@
 }
 
 void checkOrientation (Widget parent) {
-    style &= ~SWT.MIRRORED;
-    if ((style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT)) is 0) {
+    style &= ~DWT.MIRRORED;
+    if ((style & (DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT)) is 0) {
         if (parent !is null) {
-            if ((parent.style & SWT.LEFT_TO_RIGHT) !is 0) style |= SWT.LEFT_TO_RIGHT;
-            if ((parent.style & SWT.RIGHT_TO_LEFT) !is 0) style |= SWT.RIGHT_TO_LEFT;
+            if ((parent.style & DWT.LEFT_TO_RIGHT) !is 0) style |= DWT.LEFT_TO_RIGHT;
+            if ((parent.style & DWT.RIGHT_TO_LEFT) !is 0) style |= DWT.RIGHT_TO_LEFT;
         }
     }
-    style = checkBits (style, SWT.LEFT_TO_RIGHT, SWT.RIGHT_TO_LEFT, 0, 0, 0, 0);
+    style = checkBits (style, DWT.LEFT_TO_RIGHT, DWT.RIGHT_TO_LEFT, 0, 0, 0, 0);
 }
 
 /**
@@ -388,13 +388,13 @@
  *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
  *    <li>ERROR_INVALID_ARGUMENT - if the parent is disposed</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  * </ul>
  */
 void checkParent (Widget parent) {
-    if (parent is null) error (SWT.ERROR_NULL_ARGUMENT);
-    if (parent.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+    if (parent is null) error (DWT.ERROR_NULL_ARGUMENT);
+    if (parent.isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
     parent.checkWidget ();
     parent.checkOpen ();
 }
@@ -402,7 +402,7 @@
 /**
  * Checks that this class can be subclassed.
  * <p>
- * The SWT class library is intended to be subclassed
+ * The DWT class library is intended to be subclassed
  * only at specific, controlled points (most notably,
  * <code>Composite</code> and <code>Canvas</code> when
  * implementing new widgets). This method enforces this
@@ -412,32 +412,32 @@
  * method that allows a subclass of a class which does not
  * normally allow subclassing to be created, the implementer
  * agrees to be fully responsible for the fact that any such
- * subclass will likely fail between SWT releases and will be
+ * subclass will likely fail between DWT releases and will be
  * strongly platform specific. No support is provided for
  * user-written classes which are implemented in this fashion.
  * </p><p>
- * The ability to subclass outside of the allowed SWT classes
- * is intended purely to enable those not on the SWT development
+ * The ability to subclass outside of the allowed DWT classes
+ * is intended purely to enable those not on the DWT development
  * team to implement patches in order to get around specific
  * limitations in advance of when those limitations can be
  * addressed by the team. Subclassing should not be attempted
  * without an intimate and detailed understanding of the hierarchy.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
  * </ul>
  */
 protected void checkSubclass () {
-    if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+    if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 }
 
 /**
- * Throws an <code>SWTException</code> if the receiver can not
+ * Throws an <code>DWTException</code> if the receiver can not
  * be accessed by the caller. This may include both checks on
  * the state of the receiver and more generally on the entire
  * execution context. This method <em>should</em> be called by
- * widget implementors to enforce the standard SWT invariants.
+ * widget implementors to enforce the standard DWT invariants.
  * <p>
  * Currently, it is an error to invoke any method (other than
  * <code>isDisposed()</code>) on a widget that has had its
@@ -445,20 +445,20 @@
  * to call widget methods from any thread that is different
  * from the thread that created the widget.
  * </p><p>
- * In future releases of SWT, there may be more or fewer error
+ * In future releases of DWT, there may be more or fewer error
  * checks and exceptions may be thrown for different reasons.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  */
 protected void checkWidget () {
     Display display = this.display;
-    if (display is null) error (SWT.ERROR_WIDGET_DISPOSED);
-    if (display.thread !is Thread.getThis ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
-    if ((state & DISPOSED) !is 0) error (SWT.ERROR_WIDGET_DISPOSED);
+    if (display is null) error (DWT.ERROR_WIDGET_DISPOSED);
+    if (display.thread !is Thread.getThis ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
+    if ((state & DISPOSED) !is 0) error (DWT.ERROR_WIDGET_DISPOSED);
 }
 
 void createHandle (int index) {
@@ -499,7 +499,7 @@
  * event.
  * </p>
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
  *
@@ -513,12 +513,12 @@
     * more than once.  If this happens, fail silently.
     */
     if (isDisposed ()) return;
-    if (!isValidThread ()) error (SWT.ERROR_THREAD_INVALID_ACCESS);
+    if (!isValidThread ()) error (DWT.ERROR_THREAD_INVALID_ACCESS);
     release (true);
 }
 
 void error (int code) {
-    SWT.error (code);
+    DWT.error (code);
 }
 
 /**
@@ -536,7 +536,7 @@
  *
  * @return the widget data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - when the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>
  * </ul>
@@ -564,7 +564,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -573,7 +573,7 @@
  */
 public Object getData (char[] key) {
     checkWidget();
-    if (key is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
     if ((state & KEYED_DATA) !is 0) {
         char[][] table = (cast(ArrayWrapperString2) data).array;
         for (int i=1; i<table.length; i+=2) {
@@ -594,13 +594,13 @@
  *
  * @return the receiver's display
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  * </ul>
  */
 public Display getDisplay () {
     Display display = this.display;
-    if (display is null) error (SWT.ERROR_WIDGET_DISPOSED);
+    if (display is null) error (DWT.ERROR_WIDGET_DISPOSED);
     return display;
 }
 
@@ -626,14 +626,14 @@
  * when the receiver was created. This can occur when the underlying
  * operating system does not support a particular combination of
  * requested styles. For example, if the platform widget used to
- * implement a particular SWT widget always has scroll bars, the
+ * implement a particular DWT widget always has scroll bars, the
  * result of calling this method would always have the
- * <code>SWT.H_SCROLL</code> and <code>SWT.V_SCROLL</code> bits set.
+ * <code>DWT.H_SCROLL</code> and <code>DWT.V_SCROLL</code> bits set.
  * </p>
  *
  * @return the style bits
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -741,11 +741,11 @@
 }
 
 int /*long*/ gtk_key_press_event (GtkWidget* widget, GdkEventKey* event) {
-    return sendKeyEvent (SWT.KeyDown, event) ? 0 : 1;
+    return sendKeyEvent (DWT.KeyDown, event) ? 0 : 1;
 }
 
 int /*long*/ gtk_key_release_event (GtkWidget* widget, GdkEventKey* event) {
-    return sendKeyEvent (SWT.KeyUp, event) ? 0 : 1;
+    return sendKeyEvent (DWT.KeyUp, event) ? 0 : 1;
 }
 
 int /*long*/ gtk_leave_notify_event (GtkWidget* widget, GdkEventCrossing* event) {
@@ -938,17 +938,17 @@
  * Returns <code>true</code> if there are any listeners
  * for the specified event type associated with the receiver,
  * and <code>false</code> otherwise. The event type is one of
- * the event constants defined in class <code>SWT</code>.
+ * the event constants defined in class <code>DWT</code>.
  *
  * @param eventType the type of event
  * @return true if the event is hooked
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  */
 public bool isListening (int eventType) {
     checkWidget ();
@@ -969,7 +969,7 @@
 /*
  * Returns <code>true</code> if the specified eventType is
  * hooked, and <code>false</code> otherwise. Implementations
- * of SWT can avoid creating objects and sending events
+ * of DWT can avoid creating objects and sending events
  * when an event happens in the operating system but
  * there are no listeners hooked for the event.
  *
@@ -1010,17 +1010,17 @@
  * of the given type that one such event has occurred by
  * invoking their <code>handleEvent()</code> method.  The
  * event type is one of the event constants defined in class
- * <code>SWT</code>.
+ * <code>DWT</code>.
  *
  * @param eventType the type of event which has occurred
  * @param event the event data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 SWT
+ * @see DWT
  * @see #addListener
  * @see #removeListener(int, Listener)
  */
@@ -1046,7 +1046,7 @@
 void release (bool destroy) {
     if ((state & DISPOSE_SENT) is 0) {
         state |= DISPOSE_SENT;
-        sendEvent (SWT.Dispose);
+        sendEvent (DWT.Dispose);
     }
     if ((state & DISPOSED) is 0) {
         releaseChildren (destroy);
@@ -1086,7 +1086,7 @@
 /**
  * Removes the listener from the collection of listeners who will
  * be notified when an event of the given type occurs. The event
- * type is one of the event constants defined in class <code>SWT</code>.
+ * type is one of the event constants defined in class <code>DWT</code>.
  *
  * @param eventType the type of event to listen for
  * @param listener the listener which should no longer be notified when the event occurs
@@ -1094,19 +1094,19 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - 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 Listener
- * @see SWT
+ * @see DWT
  * @see #addListener
  * @see #notifyListeners
  */
 public void removeListener (int eventType, Listener handler) {
     checkWidget ();
-    if (handler is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (handler is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
     eventTable.unhook (eventType, handler);
 }
@@ -1115,9 +1115,9 @@
  * Removes the listener from the collection of listeners who will
  * be notified when an event of the given type occurs.
  * <p>
- * <b>IMPORTANT:</b> This method is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This method is <em>not</em> part of the DWT
  * public API. It is marked public only so that it can be shared
- * within the packages provided by SWT. It should never be
+ * within the packages provided by DWT. It should never be
  * referenced from application code.
  * </p>
  *
@@ -1127,7 +1127,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1135,9 +1135,9 @@
  * @see Listener
  * @see #addListener
  */
-protected void removeListener (int eventType, SWTEventListener handler) {
+protected void removeListener (int eventType, DWTEventListener handler) {
     checkWidget ();
-    if (handler is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (handler is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
     eventTable.unhook (eventType, handler);
 }
@@ -1159,7 +1159,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1169,9 +1169,9 @@
  */
 public void removeDisposeListener (DisposeListener listener) {
     checkWidget ();
-    if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (listener is null) error (DWT.ERROR_NULL_ARGUMENT);
     if (eventTable is null) return;
-    eventTable.unhook (SWT.Dispose, listener);
+    eventTable.unhook (DWT.Dispose, listener);
 }
 
 void sendEvent (Event event) {
@@ -1300,7 +1300,7 @@
  *
  * @param data the widget data
  *
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - when the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - when called from the wrong thread</li>
  * </ul>
@@ -1333,7 +1333,7 @@
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
  * </ul>
- * @exception SWTException <ul>
+ * @exception DWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
  * </ul>
@@ -1342,7 +1342,7 @@
  */
 public void setData (char[] key, Object value) {
     checkWidget();
-    if (key is null) error (SWT.ERROR_NULL_ARGUMENT);
+    if (key is null) error (DWT.ERROR_NULL_ARGUMENT);
     int index = 1;
     Object [] table = null;
     if ((state & KEYED_DATA) !is 0) {
@@ -1422,12 +1422,12 @@
 }
 
 bool setInputState (Event event, int state) {
-    if ((state & OS.GDK_MOD1_MASK) !is 0) event.stateMask |= SWT.ALT;
-    if ((state & OS.GDK_SHIFT_MASK) !is 0) event.stateMask |= SWT.SHIFT;
-    if ((state & OS.GDK_CONTROL_MASK) !is 0) event.stateMask |= SWT.CONTROL;
-    if ((state & OS.GDK_BUTTON1_MASK) !is 0) event.stateMask |= SWT.BUTTON1;
-    if ((state & OS.GDK_BUTTON2_MASK) !is 0) event.stateMask |= SWT.BUTTON2;
-    if ((state & OS.GDK_BUTTON3_MASK) !is 0) event.stateMask |= SWT.BUTTON3;
+    if ((state & OS.GDK_MOD1_MASK) !is 0) event.stateMask |= DWT.ALT;
+    if ((state & OS.GDK_SHIFT_MASK) !is 0) event.stateMask |= DWT.SHIFT;
+    if ((state & OS.GDK_CONTROL_MASK) !is 0) event.stateMask |= DWT.CONTROL;
+    if ((state & OS.GDK_BUTTON1_MASK) !is 0) event.stateMask |= DWT.BUTTON1;
+    if ((state & OS.GDK_BUTTON2_MASK) !is 0) event.stateMask |= DWT.BUTTON2;
+    if ((state & OS.GDK_BUTTON3_MASK) !is 0) event.stateMask |= DWT.BUTTON3;
     return true;
 }
 
@@ -1436,15 +1436,15 @@
     bool isNull = false;
     event.keyCode = Display.translateKey (keyEvent.keyval);
     switch (keyEvent.keyval) {
-        case OS.GDK_BackSpace:      event.character = SWT.BS; break;
-        case OS.GDK_Linefeed:       event.character = SWT.LF; break;
+        case OS.GDK_BackSpace:      event.character = DWT.BS; break;
+        case OS.GDK_Linefeed:       event.character = DWT.LF; break;
         case OS.GDK_KP_Enter:
-        case OS.GDK_Return:         event.character = SWT.CR; break;
+        case OS.GDK_Return:         event.character = DWT.CR; break;
         case OS.GDK_KP_Delete:
-        case OS.GDK_Delete:         event.character = SWT.DEL; break;
-        case OS.GDK_Escape:         event.character = SWT.ESC; break;
+        case OS.GDK_Delete:         event.character = DWT.DEL; break;
+        case OS.GDK_Escape:         event.character = DWT.ESC; break;
         case OS.GDK_Tab:
-        case OS.GDK_ISO_Left_Tab:   event.character = SWT.TAB; break;
+        case OS.GDK_ISO_Left_Tab:   event.character = DWT.TAB; break;
         default: {
             if (event.keyCode is 0) {
                 uint keyval;