--- a/dwt/dwthelper/utils.d	Sat Mar 15 17:48:32 2008 +0100
+++ b/dwt/dwthelper/utils.d	Wed Mar 19 20:14:48 2008 +0100
@@ -314,6 +314,7 @@
     }
     return src[ 0 .. pattern.length ] == pattern;
 }
+
 public char[] toLowerCase( char[] src ){
     return tango.text.Unicode.toLower( src );
 }
@@ -322,6 +323,10 @@
     return typeid(char[]).getHash(&src);
 }
 
+public char[] trim( char[] str ){
+    return tango.text.Util.trim( str ).dup;
+}
+
 public char* toStringzValidPtr( char[] src ){
     if( src ){
         return src.toStringz();

--- a/dwt/layout/FillLayout.d	Sat Mar 15 17:48:32 2008 +0100
+++ b/dwt/layout/FillLayout.d	Wed Mar 19 20:14:48 2008 +0100
@@ -21,7 +21,6 @@
 import dwt.widgets.Scrollable;
 import dwt.layout.FillData;
 
-import tango.text.Util;
 import tango.util.Convert;
 import dwt.dwthelper.utils;
 
@@ -182,8 +181,8 @@
 
 char[] getName () {
     char[] string = this.classinfo.name;
-    int index = locatePrior( string, '.');
-    if (index is string.length ) return string;
+    int index = string.lastIndexOf( '.');
+    if (index is -1 ) return string;
     return string[ index + 1 .. string.length ];
 }
 
@@ -239,7 +238,7 @@
     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)~" ";
-    string = trim( string );
+    string = string.trim();
     string ~= "}";
     return string;
 }

--- a/dwt/widgets/MessageBox.d	Sat Mar 15 17:48:32 2008 +0100
+++ b/dwt/widgets/MessageBox.d	Wed Mar 19 20:14:48 2008 +0100
@@ -216,9 +216,9 @@
 }
 
 
-/**
- * DWT extension
- */
+/++
+ + DWT extension
+ +/
 public static int showMessageBox(char[] str, char[] title, Shell shell, int style) {
     MessageBox msgBox = (shell is null ) ? new MessageBox( style ) : new MessageBox(shell, style);
     msgBox.setMessage(str);