--- a/dwt/layout/GridLayout.d	Sat Apr 26 10:01:48 2008 +0200
+++ b/dwt/layout/GridLayout.d	Mon May 05 00:12:38 2008 +0200
@@ -23,9 +23,9 @@
 
 import dwt.dwthelper.System;
 
-import tango.text.Util;
 import tango.util.Convert;
 import Math = tango.math.Math;
+import dwt.dwthelper.utils;
 
 
 /**
@@ -726,10 +726,10 @@
     return new Point (totalDefaultWidth, totalDefaultHeight);
 }
 
-char[] getName () {
-    char[] string = this.classinfo.name;
-    int index = locatePrior( string, '.');
-    if (index is string.length ) return string;
+String getName () {
+    String string = this.classinfo.name;
+    int index = string.lastIndexOf('.');
+    if (index is -1 ) return string;
     return string[ index + 1 .. string.length ];
 }
 
@@ -739,18 +739,18 @@
  *
  * @return a string representation of the layout
  */
-override public char[] toString () {
-    char[] string = getName ()~" {";
-    if (numColumns !is 1) string ~= "numColumns="~to!(char[])(numColumns)~" ";
-    if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(char[])(makeColumnsEqualWidth)~" ";
-    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)~" ";
-    if (marginRight !is 0) string ~= "marginRight="~to!(char[])(marginRight)~" ";
-    if (marginTop !is 0) string ~= "marginTop="~to!(char[])(marginTop)~" ";
-    if (marginBottom !is 0) string ~= "marginBottom="~to!(char[])(marginBottom)~" ";
-    if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~to!(char[])(horizontalSpacing)~" ";
-    if (verticalSpacing !is 0) string ~= "verticalSpacing="~to!(char[])(verticalSpacing)~" ";
+override public String toString () {
+    String string = getName ()~" {";
+    if (numColumns !is 1) string ~= "numColumns="~to!(String)(numColumns)~" ";
+    if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(String)(makeColumnsEqualWidth)~" ";
+    if (marginWidth !is 0) string ~= "marginWidth="~to!(String)(marginWidth)~" ";
+    if (marginHeight !is 0) string ~= "marginHeight="~to!(String)(marginHeight)~" ";
+    if (marginLeft !is 0) string ~= "marginLeft="~to!(String)(marginLeft)~" ";
+    if (marginRight !is 0) string ~= "marginRight="~to!(String)(marginRight)~" ";
+    if (marginTop !is 0) string ~= "marginTop="~to!(String)(marginTop)~" ";
+    if (marginBottom !is 0) string ~= "marginBottom="~to!(String)(marginBottom)~" ";
+    if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~to!(String)(horizontalSpacing)~" ";
+    if (verticalSpacing !is 0) string ~= "verticalSpacing="~to!(String)(verticalSpacing)~" ";
     string = string.trim();
     string ~= "}";
     return string;