--- a/dwt/layout/GridData.d	Sat Apr 26 10:01:48 2008 +0200
+++ b/dwt/layout/GridData.d	Mon May 05 00:12:38 2008 +0200
@@ -16,8 +16,8 @@
 import dwt.graphics.Point;
 import dwt.widgets.Control;
 
-import tango.text.Util;
 import tango.util.Convert;
+import dwt.dwthelper.utils;
 
 /**
  * <code>GridData</code> is the layout data object associated with
@@ -503,10 +503,10 @@
     currentWidth = currentHeight = -1;
 }
 
-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 ];
 }
 
@@ -516,8 +516,8 @@
  *
  * @return a string representation of the GridData object
  */
-override public char[] toString () {
-    char[] hAlign = "";
+override public String toString () {
+    String hAlign = "";
     switch (horizontalAlignment) {
         case DWT.FILL: hAlign = "DWT.FILL"; break;
         case DWT.BEGINNING: hAlign = "DWT.BEGINNING"; break;
@@ -527,9 +527,9 @@
         case DWT.RIGHT: hAlign = "DWT.RIGHT"; break;
         case DWT.CENTER: hAlign = "DWT.CENTER"; break;
         case CENTER: hAlign = "GridData.CENTER"; break;
-        default: hAlign = "Undefined "~to!(char[])(horizontalAlignment); break;
+        default: hAlign = "Undefined "~to!(String)(horizontalAlignment); break;
     }
-    char[] vAlign = "";
+    String vAlign = "";
     switch (verticalAlignment) {
         case DWT.FILL: vAlign = "DWT.FILL"; break;
         case DWT.BEGINNING: vAlign = "DWT.BEGINNING"; break;
@@ -539,22 +539,22 @@
         case DWT.BOTTOM: vAlign = "DWT.BOTTOM"; break;
         case DWT.CENTER: vAlign = "DWT.CENTER"; break;
         case CENTER: vAlign = "GridData.CENTER"; break;
-        default: vAlign = "Undefined "~to!(char[])(verticalAlignment); break;
+        default: vAlign = "Undefined "~to!(String)(verticalAlignment); break;
     }
-    char[] string = getName()~" {";
-    string ~= "horizontalAlignment="~to!(char[])(hAlign)~" ";
-    if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(char[])(horizontalIndent)~" ";
-    if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(char[])(horizontalSpan)~" ";
-    if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(char[])(grabExcessHorizontalSpace)~" ";
-    if (widthHint !is DWT.DEFAULT) string ~= "widthHint="~to!(char[])(widthHint)~" ";
-    if (minimumWidth !is 0) string ~= "minimumWidth="~to!(char[])(minimumWidth)~" ";
+    String string = getName()~" {";
+    string ~= "horizontalAlignment="~to!(String)(hAlign)~" ";
+    if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(String)(horizontalIndent)~" ";
+    if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(String)(horizontalSpan)~" ";
+    if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(String)(grabExcessHorizontalSpace)~" ";
+    if (widthHint !is DWT.DEFAULT) string ~= "widthHint="~to!(String)(widthHint)~" ";
+    if (minimumWidth !is 0) string ~= "minimumWidth="~to!(String)(minimumWidth)~" ";
     string ~= "verticalAlignment="~vAlign~" ";
-    if (verticalIndent !is 0) string ~= "verticalIndent="~to!(char[])(verticalIndent)~" ";
-    if (verticalSpan !is 1) string ~= "verticalSpan="~to!(char[])(verticalSpan)~" ";
-    if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(char[])(grabExcessVerticalSpace)~" ";
-    if (heightHint !is DWT.DEFAULT) string ~= "heightHint="~to!(char[])(heightHint)~" ";
-    if (minimumHeight !is 0) string ~= "minimumHeight="~to!(char[])(minimumHeight)~" ";
-    if (exclude) string ~= "exclude="~to!(char[])(exclude)~" ";
+    if (verticalIndent !is 0) string ~= "verticalIndent="~to!(String)(verticalIndent)~" ";
+    if (verticalSpan !is 1) string ~= "verticalSpan="~to!(String)(verticalSpan)~" ";
+    if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(String)(grabExcessVerticalSpace)~" ";
+    if (heightHint !is DWT.DEFAULT) string ~= "heightHint="~to!(String)(heightHint)~" ";
+    if (minimumHeight !is 0) string ~= "minimumHeight="~to!(String)(minimumHeight)~" ";
+    if (exclude) string ~= "exclude="~to!(String)(exclude)~" ";
     string = string.trim();
     string ~= "}";
     return string;