--- a/dwt/graphics/FontData.d	Sat Apr 26 10:01:48 2008 +0200
+++ b/dwt/graphics/FontData.d	Mon May 05 00:12:38 2008 +0200
@@ -75,7 +75,7 @@
     /**
      * The locales of the font
      */
-    char[] lang, country, variant;
+    String lang, country, variant;
 
     private static FontData s_this;
 
@@ -120,12 +120,12 @@
  *
  * @see #toString
  */
-public this(char[] string) {
+public this(String string) {
     if (string is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     int start = 0;
     int end = string.indexOf('|');
     if (end is -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    char[] version1 = string.substring(start, end);
+    String version1 = string.substring(start, end);
     try {
         if (Integer.parseInt(version1) !is 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
     } catch (NumberFormatException e) {
@@ -135,7 +135,7 @@
     start = end + 1;
     end = string.indexOf('|', start);
     if (end is -1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    char[] name = string.substring(start, end);
+    String name = string.substring(start, end);
 
     start = end + 1;
     end = string.indexOf('|', start);
@@ -165,12 +165,12 @@
     setHeight(height);
     setStyle(style);
     if (end is -1) return;
-    char[] platform = string.substring(start, end);
+    String platform = string.substring(start, end);
 
     start = end + 1;
     end = string.indexOf('|', start);
     if (end is -1) return;
-    char[] version2 = string.substring(start, end);
+    String version2 = string.substring(start, end);
 
     if (platform ==/*eq*/ "WINDOWS" && version2 ==/*eq*/ "1") {  //$NON-NLS-1$//$NON-NLS-2$
         LOGFONT newData;// = OS.IsUnicode ? cast(LOGFONT)new LOGFONTW() : new LOGFONTA();
@@ -234,7 +234,7 @@
             setStyle(style);
             return;
         }
-        char[] buffer = string.substring(start);
+        String buffer = string.substring(start);
         auto wname = StrToTCHARs(buffer);
         int len = Math.min(OS.LF_FACESIZE - 1, wname.length);
         newData.lfFaceName[ 0 .. len ] = wname[ 0 .. len ];
@@ -257,7 +257,7 @@
  *    <li>ERROR_INVALID_ARGUMENT - if the height is negative</li>
  * </ul>
  */
-public this(char[] name, int height, int style) {
+public this(String name, int height, int style) {
     if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     setName(name);
     setHeight(height);
@@ -268,7 +268,7 @@
     data.lfCharSet = cast(byte)OS.DEFAULT_CHARSET;
 }
 
-/*public*/ this(char[] name, float height, int style) {
+/*public*/ this(String name, float height, int style) {
     if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
     setName(name);
     setHeight(height);
@@ -322,7 +322,7 @@
 
     /* Get the locale ID */
     int length_ = 8;
-    char[] str = .TCHARzToStr( cast(TCHAR*)lpLocaleString, length_);
+    String str = .TCHARzToStr( cast(TCHAR*)lpLocaleString, length_);
     int lcid = Integer.parseInt(str, 16);
 
     TCHAR[] buffer = new TCHAR[length_];
@@ -380,7 +380,7 @@
  * @return the <code>String</code> representing a Locale object
  * @since 3.0
  */
-public char[] getLocale () {
+public String getLocale () {
     StringBuffer buffer = new StringBuffer ();
     char sep = '_';
     if (lang !is null) {
@@ -395,7 +395,7 @@
         buffer.append (variant);
     }
 
-    char[] result = buffer.toString ();
+    String result = buffer.toString ();
     int length_ = result.length;
     if (length_ > 0) {
         if (result.charAt (length_ - 1) is sep) {
@@ -414,7 +414,7 @@
  *
  * @see #setName
  */
-public char[] getName() {
+public String getName() {
     return .TCHARzToStr( data.lfFaceName.ptr, -1 );
 }
 
@@ -445,12 +445,12 @@
  * @see #equals
  */
 override public hash_t toHash () {
-    char[] name = getName();
+    String name = getName();
     return data.lfCharSet ^ getHeight() ^ data.lfWidth ^ data.lfEscapement ^
         data.lfOrientation ^ data.lfWeight ^ data.lfItalic ^data.lfUnderline ^
         data.lfStrikeOut ^ data.lfCharSet ^ data.lfOutPrecision ^
         data.lfClipPrecision ^ data.lfQuality ^ data.lfPitchAndFamily ^
-        typeid(char[]).getHash(&name);
+        typeid(String).getHash(&name);
 }
 
 /**
@@ -493,7 +493,7 @@
  * @param locale the <code>String</code> representing a Locale object
  * @see java.util.Locale#toString
  */
-public void setLocale(char[] locale) {
+public void setLocale(String locale) {
     lang = country = variant = null;
     if (locale !is null) {
         char sep = '_';
@@ -547,7 +547,7 @@
  *
  * @see #getName
  */
-public void setName(char[] name) {
+public void setName(String name) {
     if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 
     /* The field lfFaceName must be NULL terminated */
@@ -589,41 +589,41 @@
  *
  * @see FontData
  */
-override public char[] toString() {
+override public String toString() {
     StringBuffer buffer = new StringBuffer();
     buffer.append("1|"); //$NON-NLS-1$
     buffer.append(getName());
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(getHeightF()));
+    buffer.append(to!(String)(getHeightF()));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(getStyle()));
+    buffer.append(to!(String)(getStyle()));
     buffer.append("|"); //$NON-NLS-1$
     buffer.append("WINDOWS|1|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfHeight));
+    buffer.append(to!(String)(data.lfHeight));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfWidth));
+    buffer.append(to!(String)(data.lfWidth));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfEscapement));
+    buffer.append(to!(String)(data.lfEscapement));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfOrientation));
+    buffer.append(to!(String)(data.lfOrientation));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfWeight));
+    buffer.append(to!(String)(data.lfWeight));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfItalic));
+    buffer.append(to!(String)(data.lfItalic));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfUnderline));
+    buffer.append(to!(String)(data.lfUnderline));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfStrikeOut));
+    buffer.append(to!(String)(data.lfStrikeOut));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfCharSet));
+    buffer.append(to!(String)(data.lfCharSet));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfOutPrecision));
+    buffer.append(to!(String)(data.lfOutPrecision));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfClipPrecision));
+    buffer.append(to!(String)(data.lfClipPrecision));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfQuality));
+    buffer.append(to!(String)(data.lfQuality));
     buffer.append("|"); //$NON-NLS-1$
-    buffer.append(to!(char[])(data.lfPitchAndFamily));
+    buffer.append(to!(String)(data.lfPitchAndFamily));
     buffer.append("|"); //$NON-NLS-1$
     buffer.append(getName());
     return buffer.toString();