--- a/dwt/dwthelper/utils.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/dwthelper/utils.d	Tue Sep 16 15:28:56 2008 +0200
@@ -812,6 +812,10 @@
     dst[ dstBegin .. dstBegin + srcEnd - srcBegin ] = src[ srcBegin .. srcEnd ];
 }
 
+public wchar[] toWCharArray( String str ){
+    return toString16(str);
+}
+
 public char[] toCharArray( String str ){
     return str;
 }

--- a/dwt/events/KeyEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/KeyEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,12 @@
  *******************************************************************************/
 module dwt.events.KeyEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
 
 /**
  * Instances of this class are sent as a result of

--- a/dwt/events/MenuDetectEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/MenuDetectEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,13 @@
  *******************************************************************************/
 module dwt.events.MenuDetectEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
+
 /**
  * Instances of this class are sent whenever the platform-
  * specific trigger for showing a context menu is detected.

--- a/dwt/events/MouseEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/MouseEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,12 @@
  *******************************************************************************/
 module dwt.events.MouseEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
 
 /**
  * Instances of this class are sent whenever mouse

--- a/dwt/events/PaintEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/PaintEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,8 +12,6 @@
  *******************************************************************************/
 module dwt.events.PaintEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.graphics.GC;
@@ -21,6 +19,7 @@
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
 
 /**
  * Instances of this class are sent as a result of

--- a/dwt/events/SelectionEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/SelectionEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,14 +12,14 @@
  *******************************************************************************/
 module dwt.events.SelectionEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.widgets.Widget;
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
+
 /**
  * Instances of this class are sent as a result of
  * widgets being selected.

--- a/dwt/events/ShellEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/ShellEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,12 @@
  *******************************************************************************/
 module dwt.events.ShellEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.TypedEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
 
 /**
  * Instances of this class are sent as a result of

--- a/dwt/events/TraverseEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/TraverseEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,13 @@
  *******************************************************************************/
 module dwt.events.TraverseEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.KeyEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
+
 /**
  * Instances of this class are sent as a result of
  * widget traversal actions.

--- a/dwt/events/TypedEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/TypedEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,8 +12,6 @@
  *******************************************************************************/
 module dwt.events.TypedEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.widgets.Display;
@@ -22,6 +20,7 @@
 
 import tango.text.convert.Format;
 import tango.text.Util : split;
+import dwt.dwthelper.utils;
 
 /**
  * This is the super class for all typed event classes provided

--- a/dwt/events/VerifyEvent.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/events/VerifyEvent.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,13 +12,13 @@
  *******************************************************************************/
 module dwt.events.VerifyEvent;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.widgets.Event;
 import dwt.events.KeyEvent;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
+
 /**
  * Instances of this class are sent as a result of
  * widgets handling keyboard events

--- a/dwt/widgets/Event.d	Tue Sep 16 15:28:32 2008 +0200
+++ b/dwt/widgets/Event.d	Tue Sep 16 15:28:56 2008 +0200
@@ -12,8 +12,6 @@
  *******************************************************************************/
 module dwt.widgets.Event;
 
-import dwt.dwthelper.utils;
-
 import dwt.graphics.GC;
 import dwt.graphics.Rectangle;
 
@@ -21,6 +19,7 @@
 import dwt.widgets.Display;
 
 import tango.text.convert.Format;
+import dwt.dwthelper.utils;
 
 
 /**
@@ -226,7 +225,7 @@
  *
  * @return a string representation of the event
  */
-public override String toString () {
+override public String toString () {
     return Format( "Event {{type={} {} time={} data={} x={} y={} width={} height={} detail={}}",
         type, widget, time, data, x, y, width, height, detail );  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 }