Show
Ignore:
Timestamp:
05/04/08 18:42:55 (4 years ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

reverted char[] to String

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/widgets/Widget.d

    r178 r238  
    180180    static const int LAST_SIGNAL = 62; 
    181181 
    182     template UD_Getter( char[] name ){ 
    183         const char[] UD_Getter = "void* ud"~name~"(){ return getDisplay().getWindowProcUserData( "~name~"); }\n"; 
     182    template UD_Getter( String name ){ 
     183        const String UD_Getter = "void* ud"~name~"(){ return getDisplay().getWindowProcUserData( "~name~"); }\n"; 
    184184    } 
    185185 
    …… 
    579579 * @see #setData(String, Object) 
    580580 */ 
    581 public Object getData (char[] key) { 
     581public Object getData (String key) { 
    582582    checkWidget(); 
    583583    if (key is null) error (DWT.ERROR_NULL_ARGUMENT); 
    …… 
    585585        Object[] table = (cast(ArrayWrapperObject) data).array; 
    586586        for (int i=1; i<table.length; i+=2) { 
    587             char[] tablekey = (cast(ArrayWrapperString) table[i]).array; 
     587            String tablekey = (cast(ArrayWrapperString) table[i]).array; 
    588588            if (key ==/*eq*/ tablekey ) return table [i+1]; 
    589589        } 
    …… 
    613613} 
    614614 
    615 char[] getName () { 
    616 //  char[] str = getClass ().getName (); 
     615String getName () { 
     616//  String str = getClass ().getName (); 
    617617//  int index = str.lastIndexOf ('.'); 
    618618//  if (index is -1) return str; 
    619     char[] str = this.classinfo.name; 
     619    String str = this.classinfo.name; 
    620620    int index = str.length; 
    621621    while ((--index > 0) && (str[index] !is '.')) {} 
    …… 
    623623} 
    624624 
    625 char[] getNameText () { 
     625String getNameText () { 
    626626    return ""; 
    627627} 
    …… 
    910910} 
    911911 
    912 char [] fixMnemonic (char[] str) { 
     912char [] fixMnemonic (String str) { 
    913913    int len = str.length; 
    914     char[] text = str[0 .. len].dup; 
     914    String text = str[0 .. len].dup; 
    915915    int i = 0, j = 0; 
    916916    char [] result = new char [len * 2]; 
    …… 
    13801380 * @see #getData(String) 
    13811381 */ 
    1382 public void setData (char[] key, Object value) { 
     1382public void setData (String key, Object value) { 
    13831383    checkWidget(); 
    13841384    if (key.length is 0) error (DWT.ERROR_NULL_ARGUMENT); 
    …… 
    13881388        table = (cast(ArrayWrapperObject) data).array; 
    13891389        while (index < table.length) { 
    1390             char[] tablekey = (cast(ArrayWrapperString)table[index]).array; 
     1390            String tablekey = (cast(ArrayWrapperString)table[index]).array; 
    13911391            if (key ==/*eq*/ tablekey ) break; 
    13921392            index += 2; 
    …… 
    15281528 * @return a string representation of the receiver 
    15291529 */ 
    1530 public override char[] toString () { 
    1531     char[] str = "*Disposed*"; 
     1530public override String toString () { 
     1531    String str = "*Disposed*"; 
    15321532    if (!isDisposed ()) { 
    15331533        str = "*Wrong Thread*"; 
    …… 
    15591559 
    15601560int /*long*/ windowProc (GtkWidget* handle, int /*long*/ user_data) { 
    1561     void trace( char[] str ){ 
     1561    void trace( String str ){ 
    15621562        version(LOG) Stderr.formatln( "Widget windowProc {}", str ).flush; 
    15631563    } 
    …… 
    16221622 
    16231623int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ user_data) { 
    1624     void trace( char[] str ){ 
     1624    void trace( String str ){ 
    16251625        version(LOG) Stderr.formatln( "Widget windowProc1 {}", str ).flush; 
    16261626    } 
    …… 
    17321732 
    17331733int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) { 
    1734     void trace( char[] str ){ 
     1734    void trace( String str ){ 
    17351735        version(LOG) Stderr.formatln( "Widget windowProc2 {}", str ).flush; 
    17361736    } 
    …… 
    17661766 
    17671767int /*long*/ windowProc (GtkWidget* handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { 
    1768     void trace( char[] str ){ 
     1768    void trace( String str ){ 
    17691769        version(LOG) Stderr.formatln( "Widget windowProc3 {}", str ).flush; 
    17701770    }