# HG changeset patch # User Frank Benoit # Date 1219837705 -7200 # Node ID 649b8e223d5a6ad59f2fbcee0512f0cb7ed6c59e # Parent 354c569b57a9b3028c3d7da608401351a3c4540e fix extends diff -r 354c569b57a9 -r 649b8e223d5a dwt/browser/FilePickerFactory_1_8.d --- a/dwt/browser/FilePickerFactory_1_8.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/browser/FilePickerFactory_1_8.d Wed Aug 27 13:48:25 2008 +0200 @@ -16,7 +16,7 @@ import dwt.internal.mozilla.XPCOM; import dwt.internal.mozilla.XPCOMObject; -class FilePickerFactory_1_8 extends FilePickerFactory { +class FilePickerFactory_1_8 : FilePickerFactory { void createCOMInterfaces () { /* Create each of the interfaces that this object implements */ diff -r 354c569b57a9 -r 649b8e223d5a dwt/browser/FilePicker_1_8.d --- a/dwt/browser/FilePicker_1_8.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/browser/FilePicker_1_8.d Wed Aug 27 13:48:25 2008 +0200 @@ -15,7 +15,7 @@ import dwt.internal.mozilla.XPCOM; import dwt.internal.mozilla.XPCOMObject; -class FilePicker_1_8 extends FilePicker { +class FilePicker_1_8 : FilePicker { void createCOMInterfaces () { /* Create each of the interfaces that this object implements */ diff -r 354c569b57a9 -r 649b8e223d5a dwt/browser/Mozilla.d --- a/dwt/browser/Mozilla.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/browser/Mozilla.d Wed Aug 27 13:48:25 2008 +0200 @@ -92,7 +92,7 @@ import dwt.widgets.Menu; import dwt.widgets.Shell; -class Mozilla extends WebBrowser { +class Mozilla : WebBrowser { int /*long*/ embedHandle; nsIWebBrowser webBrowser; Object webBrowserObject; diff -r 354c569b57a9 -r 649b8e223d5a dwt/browser/PromptDialog.d --- a/dwt/browser/PromptDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/browser/PromptDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -27,7 +27,7 @@ import dwt.widgets.Text; import dwt.widgets.Widget; -class PromptDialog extends Dialog { +class PromptDialog : Dialog { PromptDialog(Shell parent, int style) { super(parent, style); diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/DragDetectEvent.d --- a/dwt/events/DragDetectEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/DragDetectEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -23,7 +23,7 @@ * @since 3.3 */ -public final class DragDetectEvent extends MouseEvent { +public final class DragDetectEvent : MouseEvent { private static final long serialVersionUID = -7229172519733647232L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/DragDetectListener.d --- a/dwt/events/DragDetectListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/DragDetectListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * * @since 3.3 */ -public interface DragDetectListener extends DWTEventListener { +public interface DragDetectListener : DWTEventListener { /** * Sent when a drag gesture is detected. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ExpandEvent.d --- a/dwt/events/ExpandEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ExpandEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -24,7 +24,7 @@ * @since 3.2 */ -public class ExpandEvent extends SelectionEvent { +public class ExpandEvent : SelectionEvent { static final long serialVersionUID = 3976735856884987356L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ExpandListener.d --- a/dwt/events/ExpandListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ExpandListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -32,7 +32,7 @@ * * @since 3.2 */ -public interface ExpandListener extends DWTEventListener { +public interface ExpandListener : DWTEventListener { /** * Sent when an item is collapsed. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/FocusEvent.d --- a/dwt/events/FocusEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/FocusEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see FocusListener */ -public final class FocusEvent extends TypedEvent { +public final class FocusEvent : TypedEvent { static final long serialVersionUID = 3258134643684227381L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/FocusListener.d --- a/dwt/events/FocusListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/FocusListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see FocusAdapter * @see FocusEvent */ -public interface FocusListener extends DWTEventListener { +public interface FocusListener : DWTEventListener { /** * Sent when a control gets focus. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/HelpEvent.d --- a/dwt/events/HelpEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/HelpEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see HelpListener */ -public final class HelpEvent extends TypedEvent { +public final class HelpEvent : TypedEvent { static final long serialVersionUID = 3257001038606251315L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/HelpListener.d --- a/dwt/events/HelpListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/HelpListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * * @see HelpEvent */ -public interface HelpListener extends DWTEventListener { +public interface HelpListener : DWTEventListener { /** * Sent when help is requested for a control, typically diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/KeyEvent.d --- a/dwt/events/KeyEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/KeyEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -34,7 +34,7 @@ * @see TraverseListener */ -public class KeyEvent extends TypedEvent { +public class KeyEvent : TypedEvent { /** * the character represented by the key that was typed. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/KeyListener.d --- a/dwt/events/KeyListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/KeyListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see KeyAdapter * @see KeyEvent */ -public interface KeyListener extends DWTEventListener { +public interface KeyListener : DWTEventListener { /** * Sent when a key is pressed on the system keyboard. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MenuDetectEvent.d --- a/dwt/events/MenuDetectEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MenuDetectEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -24,7 +24,7 @@ * @since 3.3 */ -public final class MenuDetectEvent extends TypedEvent { +public final class MenuDetectEvent : TypedEvent { /** * the display-relative x coordinate of the pointer diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MenuDetectListener.d --- a/dwt/events/MenuDetectListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MenuDetectListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -32,7 +32,7 @@ * * @since 3.3 */ -public interface MenuDetectListener extends DWTEventListener { +public interface MenuDetectListener : DWTEventListener { /** * Sent when the platform-dependent trigger for showing a menu item is detected. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MenuEvent.d --- a/dwt/events/MenuEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MenuEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see MenuListener */ -public final class MenuEvent extends TypedEvent { +public final class MenuEvent : TypedEvent { static final long serialVersionUID = 3258132440332383025L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MenuListener.d --- a/dwt/events/MenuListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MenuListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * @see MenuAdapter * @see MenuEvent */ -public interface MenuListener extends DWTEventListener { +public interface MenuListener : DWTEventListener { /** * Sent when a menu is hidden. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ModifyEvent.d --- a/dwt/events/ModifyEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ModifyEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see ModifyListener */ -public final class ModifyEvent extends TypedEvent { +public final class ModifyEvent : TypedEvent { static final long serialVersionUID = 3258129146227011891L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ModifyListener.d --- a/dwt/events/ModifyListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ModifyListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -28,7 +28,7 @@ * * @see ModifyEvent */ -public interface ModifyListener extends DWTEventListener { +public interface ModifyListener : DWTEventListener { /** * Sent when the text is modified. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MouseEvent.d --- a/dwt/events/MouseEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MouseEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -31,7 +31,7 @@ * @see MouseTrackListener */ -public class MouseEvent extends TypedEvent { +public class MouseEvent : TypedEvent { /** * the button that was pressed or released; 1 for the diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MouseListener.d --- a/dwt/events/MouseListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MouseListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see MouseAdapter * @see MouseEvent */ -public interface MouseListener extends DWTEventListener { +public interface MouseListener : DWTEventListener { /** * Sent when a mouse button is pressed twice within the diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MouseMoveListener.d --- a/dwt/events/MouseMoveListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MouseMoveListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -28,7 +28,7 @@ * * @see MouseEvent */ -public interface MouseMoveListener extends DWTEventListener { +public interface MouseMoveListener : DWTEventListener { /** * Sent when the mouse moves. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MouseTrackListener.d --- a/dwt/events/MouseTrackListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MouseTrackListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -31,7 +31,7 @@ * @see MouseTrackAdapter * @see MouseEvent */ -public interface MouseTrackListener extends DWTEventListener { +public interface MouseTrackListener : DWTEventListener { /** * Sent when the mouse pointer passes into the area of diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/MouseWheelListener.d --- a/dwt/events/MouseWheelListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/MouseWheelListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -31,7 +31,7 @@ * * @since 3.3 */ -public interface MouseWheelListener extends DWTEventListener { +public interface MouseWheelListener : DWTEventListener { /** * Sent when the mouse wheel is scrolled. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/PaintEvent.d --- a/dwt/events/PaintEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/PaintEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -23,7 +23,7 @@ * @see PaintListener */ -public final class PaintEvent extends TypedEvent { +public final class PaintEvent : TypedEvent { /** * the graphics context to use when painting diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/PaintListener.d --- a/dwt/events/PaintListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/PaintListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * * @see PaintEvent */ -public interface PaintListener extends DWTEventListener { +public interface PaintListener : DWTEventListener { /** * Sent when a paint event occurs for the control. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/SelectionEvent.d --- a/dwt/events/SelectionEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/SelectionEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -26,7 +26,7 @@ * @see SelectionListener */ -public class SelectionEvent extends TypedEvent { +public class SelectionEvent : TypedEvent { /** * The item that was selected. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/SelectionListener.d --- a/dwt/events/SelectionListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/SelectionListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see SelectionAdapter * @see SelectionEvent */ -public interface SelectionListener extends DWTEventListener { +public interface SelectionListener : DWTEventListener { /** * Sent when selection occurs in the control. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ShellEvent.d --- a/dwt/events/ShellEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ShellEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see ShellListener */ -public final class ShellEvent extends TypedEvent { +public final class ShellEvent : TypedEvent { /** * A flag indicating whether the operation should be allowed. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/ShellListener.d --- a/dwt/events/ShellListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/ShellListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * @see ShellAdapter * @see ShellEvent */ -public interface ShellListener extends DWTEventListener { +public interface ShellListener : DWTEventListener { /** * Sent when a shell becomes the active window. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/TraverseEvent.d --- a/dwt/events/TraverseEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/TraverseEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -79,7 +79,7 @@ * @see TraverseListener */ -public final class TraverseEvent extends KeyEvent { +public final class TraverseEvent : KeyEvent { /** * The traversal type. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/TraverseListener.d --- a/dwt/events/TraverseListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/TraverseListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * * @see TraverseEvent */ -public interface TraverseListener extends DWTEventListener { +public interface TraverseListener : DWTEventListener { /** * Sent when a traverse event occurs in a control. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/TreeEvent.d --- a/dwt/events/TreeEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/TreeEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see TreeListener */ -public final class TreeEvent extends SelectionEvent { +public final class TreeEvent : SelectionEvent { static final long serialVersionUID = 3257282548009677109L; diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/TreeListener.d --- a/dwt/events/TreeListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/TreeListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see TreeAdapter * @see TreeEvent */ -public interface TreeListener extends DWTEventListener { +public interface TreeListener : DWTEventListener { /** * Sent when a tree branch is collapsed. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/TypedEvent.d --- a/dwt/events/TypedEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/TypedEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -25,7 +25,7 @@ * * @see dwt.widgets.Event */ -public class TypedEvent extends DWTEventObject { +public class TypedEvent : DWTEventObject { /** * the display where the event occurred diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/VerifyEvent.d --- a/dwt/events/VerifyEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/VerifyEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -22,7 +22,7 @@ * @see VerifyListener */ -public final class VerifyEvent extends KeyEvent { +public final class VerifyEvent : KeyEvent { /** * the range of text being modified. diff -r 354c569b57a9 -r 649b8e223d5a dwt/events/VerifyListener.d --- a/dwt/events/VerifyListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/events/VerifyListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * * @see VerifyEvent */ -public interface VerifyListener extends DWTEventListener { +public interface VerifyListener : DWTEventListener { /** * Sent when the text is about to be modified. diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Color.d --- a/dwt/graphics/Color.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Color.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see RGB * @see Device#getSystemColor */ -public final class Color extends Resource { +public final class Color : Resource { /** * the handle to the OS color resource * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Cursor.d --- a/dwt/graphics/Cursor.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Cursor.d Wed Aug 27 13:48:25 2008 +0200 @@ -48,7 +48,7 @@ *

*/ -public final class Cursor extends Resource { +public final class Cursor : Resource { /** * the handle to the OS cursor resource diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Font.d --- a/dwt/graphics/Font.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Font.d Wed Aug 27 13:48:25 2008 +0200 @@ -32,7 +32,7 @@ * * @see FontData */ -public final class Font extends Resource { +public final class Font : Resource { /** * the handle to the OS font resource diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/GC.d --- a/dwt/graphics/GC.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/GC.d Wed Aug 27 13:48:25 2008 +0200 @@ -60,7 +60,7 @@ * * @see dwt.events.PaintEvent */ -public final class GC extends Resource { +public final class GC : Resource { /** * the handle to the OS device context * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Image.d --- a/dwt/graphics/Image.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Image.d Wed Aug 27 13:48:25 2008 +0200 @@ -74,7 +74,7 @@ * @see ImageData * @see ImageLoader */ -public final class Image extends Resource implements Drawable { +public final class Image : Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/ImageLoaderEvent.d --- a/dwt/graphics/ImageLoaderEvent.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/ImageLoaderEvent.d Wed Aug 27 13:48:25 2008 +0200 @@ -32,7 +32,7 @@ * @see ImageLoaderListener */ -public class ImageLoaderEvent extends DWTEventObject { +public class ImageLoaderEvent : DWTEventObject { /** * if the endOfImage flag is false, then this is a diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/ImageLoaderListener.d --- a/dwt/graphics/ImageLoaderListener.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/ImageLoaderListener.d Wed Aug 27 13:48:25 2008 +0200 @@ -30,7 +30,7 @@ * @see ImageLoaderEvent */ -public interface ImageLoaderListener extends DWTEventListener { +public interface ImageLoaderListener : DWTEventListener { /** * Sent when image data is either partially or completely loaded. diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Path.d --- a/dwt/graphics/Path.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Path.d Wed Aug 27 13:48:25 2008 +0200 @@ -44,7 +44,7 @@ * * @since 3.1 */ -public class Path extends Resource { +public class Path : Resource { /** * the OS resource for the Path diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Pattern.d --- a/dwt/graphics/Pattern.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Pattern.d Wed Aug 27 13:48:25 2008 +0200 @@ -34,7 +34,7 @@ * * @since 3.1 */ -public class Pattern extends Resource { +public class Pattern : Resource { NSColor color; NSGradient gradient; NSPoint pt1, pt2; diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Region.d --- a/dwt/graphics/Region.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Region.d Wed Aug 27 13:48:25 2008 +0200 @@ -33,7 +33,7 @@ * when those instances are no longer required. *

*/ -public final class Region extends Resource { +public final class Region : Resource { /** * the OS resource for the region * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/TextLayout.d --- a/dwt/graphics/TextLayout.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/TextLayout.d Wed Aug 27 13:48:25 2008 +0200 @@ -43,7 +43,7 @@ * * @since 3.0 */ -public final class TextLayout extends Resource { +public final class TextLayout : Resource { NSTextStorage textStorage; NSLayoutManager layoutManager; diff -r 354c569b57a9 -r 649b8e223d5a dwt/graphics/Transform.d --- a/dwt/graphics/Transform.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/graphics/Transform.d Wed Aug 27 13:48:25 2008 +0200 @@ -34,7 +34,7 @@ * * @since 3.1 */ -public class Transform extends Resource { +public class Transform : Resource { /** * the OS resource for the Transform * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/layout/FillLayout.d --- a/dwt/layout/FillLayout.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/layout/FillLayout.d Wed Aug 27 13:48:25 2008 +0200 @@ -46,7 +46,7 @@ * *

*/ -public final class FillLayout extends Layout { +public final class FillLayout : Layout { /** * type specifies how controls will be positioned * within the layout. diff -r 354c569b57a9 -r 649b8e223d5a dwt/layout/FormLayout.d --- a/dwt/layout/FormLayout.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/layout/FormLayout.d Wed Aug 27 13:48:25 2008 +0200 @@ -90,7 +90,7 @@ * @since 2.0 * */ -public final class FormLayout extends Layout { +public final class FormLayout : Layout { /** * marginWidth specifies the number of pixels of horizontal margin diff -r 354c569b57a9 -r 649b8e223d5a dwt/layout/GridLayout.d --- a/dwt/layout/GridLayout.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/layout/GridLayout.d Wed Aug 27 13:48:25 2008 +0200 @@ -47,7 +47,7 @@ * * @see GridData */ -public final class GridLayout extends Layout { +public final class GridLayout : Layout { /** * numColumns specifies the number of cell columns in the layout. diff -r 354c569b57a9 -r 649b8e223d5a dwt/layout/RowLayout.d --- a/dwt/layout/RowLayout.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/layout/RowLayout.d Wed Aug 27 13:48:25 2008 +0200 @@ -57,7 +57,7 @@ * * @see RowData */ -public final class RowLayout extends Layout { +public final class RowLayout : Layout { /** * type specifies whether the layout places controls in rows or diff -r 354c569b57a9 -r 649b8e223d5a dwt/opengl/GLCanvas.d --- a/dwt/opengl/GLCanvas.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/opengl/GLCanvas.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * @since 3.2 */ -public class GLCanvas extends Canvas { +public class GLCanvas : Canvas { NSOpenGLView glView; NSOpenGLPixelFormat pixelFormat; static final int MAX_ATTRIBUTES = 32; diff -r 354c569b57a9 -r 649b8e223d5a dwt/printing/PrintDialog.d --- a/dwt/printing/PrintDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/printing/PrintDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * within the DWT implementation. *

*/ -public class PrintDialog extends Dialog { +public class PrintDialog : Dialog { PrinterData printerData; int scope = PrinterData.ALL_PAGES; int startPage = 1, endPage = 1; diff -r 354c569b57a9 -r 649b8e223d5a dwt/printing/Printer.d --- a/dwt/printing/Printer.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/printing/Printer.d Wed Aug 27 13:48:25 2008 +0200 @@ -44,7 +44,7 @@ * @see PrinterData * @see PrintDialog */ -public final class Printer extends Device { +public final class Printer : Device { PrinterData data; NSPrinter printer; bool inPage, isGCCreated; diff -r 354c569b57a9 -r 649b8e223d5a dwt/printing/PrinterData.d --- a/dwt/printing/PrinterData.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/printing/PrinterData.d Wed Aug 27 13:48:25 2008 +0200 @@ -32,7 +32,7 @@ * @see PrintDialog#open */ -public final class PrinterData extends DeviceData { +public final class PrinterData : DeviceData { /** * the printer driver diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Button.d --- a/dwt/widgets/Button.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Button.d Wed Aug 27 13:48:25 2008 +0200 @@ -53,7 +53,7 @@ * within the DWT implementation. *

*/ -public class Button extends Control { +public class Button : Control { String text = ""; Image image; bool grayed; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Canvas.d --- a/dwt/widgets/Canvas.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Canvas.d Wed Aug 27 13:48:25 2008 +0200 @@ -46,7 +46,7 @@ * * @see Composite */ -public class Canvas extends Composite { +public class Canvas : Composite { Caret caret; IME ime; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Caret.d --- a/dwt/widgets/Caret.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Caret.d Wed Aug 27 13:48:25 2008 +0200 @@ -36,7 +36,7 @@ * within the DWT implementation. *

*/ -public class Caret extends Widget { +public class Caret : Widget { Canvas parent; int x, y, width, height; bool isVisible, isShowing; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ColorDialog.d --- a/dwt/widgets/ColorDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ColorDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -38,7 +38,7 @@ * within the DWT implementation. *

*/ -public class ColorDialog extends Dialog { +public class ColorDialog : Dialog { RGB rgb; /** diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Combo.d --- a/dwt/widgets/Combo.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Combo.d Wed Aug 27 13:48:25 2008 +0200 @@ -70,7 +70,7 @@ * * @see List */ -public class Combo extends Composite { +public class Combo : Composite { int textLimit = LIMIT; /** diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Composite.d --- a/dwt/widgets/Composite.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Composite.d Wed Aug 27 13:48:25 2008 +0200 @@ -54,7 +54,7 @@ * * @see Canvas */ -public class Composite extends Scrollable { +public class Composite : Scrollable { Layout layout; Control[] tabList; int scrolledVisibleRgn, siblingsVisibleRgn; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Control.d --- a/dwt/widgets/Control.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Control.d Wed Aug 27 13:48:25 2008 +0200 @@ -69,7 +69,7 @@ * within the DWT implementation. *

*/ -public abstract class Control extends Widget implements Drawable { +public abstract class Control : Widget implements Drawable { /** * the handle to the OS resource * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/CoolBar.d --- a/dwt/widgets/CoolBar.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/CoolBar.d Wed Aug 27 13:48:25 2008 +0200 @@ -44,7 +44,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class CoolBar extends Composite { +public class CoolBar : Composite { CoolItem[][] items = new CoolItem[0][0]; CoolItem[] originalItems = new CoolItem[0]; Cursor hoverCursor, dragCursor, cursor; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/CoolItem.d --- a/dwt/widgets/CoolItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/CoolItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -40,7 +40,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class CoolItem extends Item { +public class CoolItem : Item { Control control; CoolBar parent; bool ideal; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/DateTime.d --- a/dwt/widgets/DateTime.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/DateTime.d Wed Aug 27 13:48:25 2008 +0200 @@ -49,7 +49,7 @@ * * @since 3.3 */ -public class DateTime extends Composite { +public class DateTime : Composite { /** * Constructs a new instance of this class given its parent diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Decorations.d --- a/dwt/widgets/Decorations.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Decorations.d Wed Aug 27 13:48:25 2008 +0200 @@ -95,7 +95,7 @@ * @see Shell * @see DWT */ -public class Decorations extends Canvas { +public class Decorations : Canvas { Image image; Image [] images = new Image [0]; Menu menuBar; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/DirectoryDialog.d --- a/dwt/widgets/DirectoryDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/DirectoryDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -34,7 +34,7 @@ * within the DWT implementation. *

*/ -public class DirectoryDialog extends Dialog { +public class DirectoryDialog : Dialog { String message = "", filterPath = ""; /** diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Display.d --- a/dwt/widgets/Display.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Display.d Wed Aug 27 13:48:25 2008 +0200 @@ -131,7 +131,7 @@ * @see #sleep * @see Device#dispose */ -public class Display extends Device { +public class Display : Device { /* Windows and Events */ Event [] eventQueue; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ExpandBar.d --- a/dwt/widgets/ExpandBar.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ExpandBar.d Wed Aug 27 13:48:25 2008 +0200 @@ -48,7 +48,7 @@ * * @since 3.2 */ -public class ExpandBar extends Composite { +public class ExpandBar : Composite { ExpandItem [] items; int itemCount; ExpandItem focusItem; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ExpandItem.d --- a/dwt/widgets/ExpandItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ExpandItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -37,7 +37,7 @@ * * @since 3.2 */ -public class ExpandItem extends Item { +public class ExpandItem : Item { ExpandBar parent; Control control; bool expanded; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/FileDialog.d --- a/dwt/widgets/FileDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/FileDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -37,7 +37,7 @@ * within the DWT implementation. *

*/ -public class FileDialog extends Dialog { +public class FileDialog : Dialog { String [] filterNames = new String [0]; String [] filterExtensions = new String [0]; String [] fileNames = new String[0]; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/FontDialog.d --- a/dwt/widgets/FontDialog.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/FontDialog.d Wed Aug 27 13:48:25 2008 +0200 @@ -41,7 +41,7 @@ * within the DWT implementation. *

*/ -public class FontDialog extends Dialog { +public class FontDialog : Dialog { FontData fontData; RGB rgb; bool open; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Group.d --- a/dwt/widgets/Group.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Group.d Wed Aug 27 13:48:25 2008 +0200 @@ -44,7 +44,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Group extends Composite { +public class Group : Composite { SWTView contentView; String text = ""; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/IME.d --- a/dwt/widgets/IME.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/IME.d Wed Aug 27 13:48:25 2008 +0200 @@ -16,7 +16,7 @@ import dwt.DWT; import dwt.graphics.TextStyle; -public class IME extends Widget { +public class IME : Widget { Canvas parent; int caretOffset; int startOffset; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Item.d --- a/dwt/widgets/Item.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Item.d Wed Aug 27 13:48:25 2008 +0200 @@ -29,7 +29,7 @@ * */ -public abstract class Item extends Widget { +public abstract class Item : Widget { String text; Image image; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Label.d --- a/dwt/widgets/Label.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Label.d Wed Aug 27 13:48:25 2008 +0200 @@ -55,7 +55,7 @@ * within the DWT implementation. *

*/ -public class Label extends Control { +public class Label : Control { String text = ""; Image image; bool isImage; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Link.d --- a/dwt/widgets/Link.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Link.d Wed Aug 27 13:48:25 2008 +0200 @@ -46,7 +46,7 @@ * * @since 3.1 */ -public class Link extends Control { +public class Link : Control { NSScrollView scrollView; String text; Point [] offsets; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/List.d --- a/dwt/widgets/List.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/List.d Wed Aug 27 13:48:25 2008 +0200 @@ -53,7 +53,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class List extends Scrollable { +public class List : Scrollable { NSTableColumn column; String [] items; int itemCount; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Menu.d --- a/dwt/widgets/Menu.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Menu.d Wed Aug 27 13:48:25 2008 +0200 @@ -46,7 +46,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Menu extends Widget { +public class Menu : Widget { /** * the handle to the OS resource * (Warning: This field is platform dependent) diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/MenuItem.d --- a/dwt/widgets/MenuItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/MenuItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -42,7 +42,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class MenuItem extends Item { +public class MenuItem : Item { NSMenuItem nsItem; Menu parent, menu; int accelerator; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/MessageBox.d --- a/dwt/widgets/MessageBox.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/MessageBox.d Wed Aug 27 13:48:25 2008 +0200 @@ -39,7 +39,7 @@ * within the DWT implementation. *

*/ -public class MessageBox extends Dialog { +public class MessageBox : Dialog { String message = ""; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ProgressBar.d --- a/dwt/widgets/ProgressBar.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ProgressBar.d Wed Aug 27 13:48:25 2008 +0200 @@ -37,7 +37,7 @@ * within the DWT implementation. *

*/ -public class ProgressBar extends Control { +public class ProgressBar : Control { /** * Constructs a new instance of this class given its parent diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Sash.d --- a/dwt/widgets/Sash.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Sash.d Wed Aug 27 13:48:25 2008 +0200 @@ -42,7 +42,7 @@ * within the DWT implementation. *

*/ -public class Sash extends Control { +public class Sash : Control { Cursor sizeCursor; bool dragging; int lastX, lastY, startX, startY; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Scale.d --- a/dwt/widgets/Scale.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Scale.d Wed Aug 27 13:48:25 2008 +0200 @@ -39,7 +39,7 @@ * within the DWT implementation. *

*/ -public class Scale extends Control { +public class Scale : Control { int increment = 1; int pageIncrement = 10; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ScrollBar.d --- a/dwt/widgets/ScrollBar.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ScrollBar.d Wed Aug 27 13:48:25 2008 +0200 @@ -85,7 +85,7 @@ * @see Scrollable#getHorizontalBar * @see Scrollable#getVerticalBar */ -public class ScrollBar extends Widget { +public class ScrollBar : Widget { NSScroller view; Scrollable parent; int minimum, maximum, thumb; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Scrollable.d --- a/dwt/widgets/Scrollable.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Scrollable.d Wed Aug 27 13:48:25 2008 +0200 @@ -38,7 +38,7 @@ * within the DWT implementation. *

*/ -public abstract class Scrollable extends Control { +public abstract class Scrollable : Control { SWTScrollView scrollView; ScrollBar horizontalBar, verticalBar; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Shell.d --- a/dwt/widgets/Shell.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Shell.d Wed Aug 27 13:48:25 2008 +0200 @@ -128,7 +128,7 @@ * @see Decorations * @see DWT */ -public class Shell extends Decorations { +public class Shell : Decorations { NSWindow window; SWTWindowDelegate windowDelegate; bool opened, moved, resized, fullScreen; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Slider.d --- a/dwt/widgets/Slider.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Slider.d Wed Aug 27 13:48:25 2008 +0200 @@ -71,7 +71,7 @@ * * @see ScrollBar */ -public class Slider extends Control { +public class Slider : Control { bool dragging; int minimum, maximum, thumb; int increment = 1; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Spinner.d --- a/dwt/widgets/Spinner.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Spinner.d Wed Aug 27 13:48:25 2008 +0200 @@ -53,7 +53,7 @@ * * @since 3.1 */ -public class Spinner extends Composite { +public class Spinner : Composite { NSTextField textView; NSStepper buttonView; int pageIncrement = 10; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TabFolder.d --- a/dwt/widgets/TabFolder.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TabFolder.d Wed Aug 27 13:48:25 2008 +0200 @@ -53,7 +53,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class TabFolder extends Composite { +public class TabFolder : Composite { TabItem [] items; int itemCount; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TabItem.d --- a/dwt/widgets/TabItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TabItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -38,7 +38,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class TabItem extends Item { +public class TabItem : Item { TabFolder parent; Control control; String toolTipText; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Table.d --- a/dwt/widgets/Table.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Table.d Wed Aug 27 13:48:25 2008 +0200 @@ -84,7 +84,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Table extends Composite { +public class Table : Composite { TableItem [] items; TableColumn [] columns; TableColumn sortColumn; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TableColumn.d --- a/dwt/widgets/TableColumn.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TableColumn.d Wed Aug 27 13:48:25 2008 +0200 @@ -38,7 +38,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class TableColumn extends Item { +public class TableColumn : Item { Table parent; NSTableColumn nsColumn; String toolTipText; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TableItem.d --- a/dwt/widgets/TableItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TableItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -41,7 +41,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class TableItem extends Item { +public class TableItem : Item { Table parent; String [] strings; Image [] images; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Text.d --- a/dwt/widgets/Text.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Text.d Wed Aug 27 13:48:25 2008 +0200 @@ -57,7 +57,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Text extends Scrollable { +public class Text : Scrollable { int textLimit = LIMIT, tabs = 8; char echoCharacter; bool doubleClick; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ToolBar.d --- a/dwt/widgets/ToolBar.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ToolBar.d Wed Aug 27 13:48:25 2008 +0200 @@ -44,7 +44,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class ToolBar extends Composite { +public class ToolBar : Composite { int itemCount; ToolItem [] items; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ToolItem.d --- a/dwt/widgets/ToolItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ToolItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -49,7 +49,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class ToolItem extends Item { +public class ToolItem : Item { NSView view; NSButton button, arrow; int width = DEFAULT_SEPARATOR_WIDTH; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/ToolTip.d --- a/dwt/widgets/ToolTip.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/ToolTip.d Wed Aug 27 13:48:25 2008 +0200 @@ -48,7 +48,7 @@ * * @since 3.2 */ -public class ToolTip extends Widget { +public class ToolTip : Widget { Shell parent, tip; TrayItem item; int x, y; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Tracker.d --- a/dwt/widgets/Tracker.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Tracker.d Wed Aug 27 13:48:25 2008 +0200 @@ -52,7 +52,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Tracker extends Widget { +public class Tracker : Widget { Control parent; bool tracking, cancelled, stippled; Cursor clientCursor, resizeCursor; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Tray.d --- a/dwt/widgets/Tray.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Tray.d Wed Aug 27 13:48:25 2008 +0200 @@ -34,7 +34,7 @@ * * @since 3.0 */ -public class Tray extends Widget { +public class Tray : Widget { int itemCount; TrayItem [] items = new TrayItem [4]; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TrayItem.d --- a/dwt/widgets/TrayItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TrayItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -46,7 +46,7 @@ * * @since 3.0 */ -public class TrayItem extends Item { +public class TrayItem : Item { Tray parent; ToolTip toolTip; String toolTipText; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/Tree.d --- a/dwt/widgets/Tree.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/Tree.d Wed Aug 27 13:48:25 2008 +0200 @@ -90,7 +90,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class Tree extends Composite { +public class Tree : Composite { NSTableColumn firstColumn, checkColumn; NSTableHeaderView headerView; TreeItem [] items; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TreeColumn.d --- a/dwt/widgets/TreeColumn.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TreeColumn.d Wed Aug 27 13:48:25 2008 +0200 @@ -39,7 +39,7 @@ * * @since 3.1 */ -public class TreeColumn extends Item { +public class TreeColumn : Item { NSTableColumn nsColumn; Tree parent; String toolTipText; diff -r 354c569b57a9 -r 649b8e223d5a dwt/widgets/TreeItem.d --- a/dwt/widgets/TreeItem.d Tue Aug 19 17:40:11 2008 +0200 +++ b/dwt/widgets/TreeItem.d Wed Aug 27 13:48:25 2008 +0200 @@ -43,7 +43,7 @@ * IMPORTANT: This class is not intended to be subclassed. *

*/ -public class TreeItem extends Item { +public class TreeItem : Item { Tree parent; TreeItem parentItem; TreeItem[] items;