Mercurial > projects > dwt-win
diff dwt/widgets/Widget.d @ 212:ab60f3309436
reverted the char[] to String and use the an alias.
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Mon, 05 May 2008 00:12:38 +0200 |
parents | a9a4ef66a7df |
children | 36f5cb12e1a2 |
line wrap: on
line diff
--- a/dwt/widgets/Widget.d Sat Apr 26 10:01:48 2008 +0200 +++ b/dwt/widgets/Widget.d Mon May 05 00:12:38 2008 +0200 @@ -474,7 +474,7 @@ return null; } -char [] fixMnemonic (char[] string) { +char [] fixMnemonic (String string) { char [] buffer = string.dup; int i = 0, j = 0; while (i < buffer.length) { @@ -543,13 +543,13 @@ * * @see #setData(String, Object) */ -public Object getData (char[] key) { +public Object getData (String key) { checkWidget(); if (key is null) error (DWT.ERROR_NULL_ARGUMENT); if ((state & KEYED_DATA) !is 0) { Object [] table = (cast(ArrayWrapperObject) data).array; for (int i=1; i<table.length; i+=2) { - char[] tablekey = (cast(ArrayWrapperString) table[i]).array; + String tablekey = (cast(ArrayWrapperString) table[i]).array; if (key ==/*eq*/ tablekey ) return table [i+1]; } } @@ -587,8 +587,8 @@ * * @return the name of the widget */ -char[] getName () { - char[] str = this.classinfo.name; +String getName () { + String str = this.classinfo.name; int index = str.length; while ((--index > 0) && (str[index] !is '.')) {} return str[index + 1 .. $ ]; @@ -604,7 +604,7 @@ * * @see #toString */ -char[] getNameText () { +String getNameText () { return ""; //$NON-NLS-1$ } @@ -1089,7 +1089,7 @@ * * @see #getData(String) */ -public void setData (char[] key, Object value) { +public void setData (String key, Object value) { checkWidget(); if (key.length is 0) error (DWT.ERROR_NULL_ARGUMENT); int index = 1; @@ -1097,7 +1097,7 @@ if ((state & KEYED_DATA) !is 0) { table = (cast(ArrayWrapperObject) data).array; while (index < table.length) { - char[] tablekey = (cast(ArrayWrapperString)table[index]).array; + String tablekey = (cast(ArrayWrapperString)table[index]).array; if (key ==/*eq*/ tablekey ) break; index += 2; } @@ -1296,8 +1296,8 @@ * * @return a string representation of the receiver */ -override public char[] toString () { - char[] string = "*Disposed*"; //$NON-NLS-1$ +override public String toString () { + String string = "*Disposed*"; //$NON-NLS-1$ if (!isDisposed ()) { string = "*Wrong Thread*"; //$NON-NLS-1$ if (isValidThread ()) string = getNameText ();