--- a/dwt/layout/FillLayout.d	Mon Mar 17 01:04:59 2008 +0100
+++ b/dwt/layout/FillLayout.d	Mon Mar 17 21:47:05 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;
 }