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/dnd/Clipboard.d

    r158 r238  
    114114 */ 
    115115protected void checkSubclass () { 
    116     char[] name = this.classinfo.name; 
    117     char[] validName = Clipboard.classinfo.name; 
     116    String name = this.classinfo.name; 
     117    String validName = Clipboard.classinfo.name; 
    118118    if ( validName !=/*eq*/ name ) { 
    119119        DND.error (DWT.ERROR_INVALID_SUBCLASS); 
    …… 
    553553 * </ul> 
    554554 */ 
    555 public char[][] getAvailableTypeNames() { 
     555public String[] getAvailableTypeNames() { 
    556556    checkWidget(); 
    557557    auto types1 = getAvailableClipboardTypes(); 
    558558    auto types2 = getAvailablePrimaryTypes(); 
    559     char[][] result = new char[][types1.length + types2.length]; 
     559    String[] result = new String[types1.length + types2.length]; 
    560560    int count = 0; 
    561561    for (int i = 0; i < types1.length; i++) { 
    …… 
    564564            continue; 
    565565        } 
    566         char[] buffer = tango.stdc.stringz.fromStringz( pName ).dup; 
     566        String buffer = tango.stdc.stringz.fromStringz( pName ).dup; 
    567567        OS.g_free (pName); 
    568568        result[count++] = "GTKCLIPBOARD "~buffer; 
    …… 
    573573            continue; 
    574574        } 
    575         char[] buffer = tango.stdc.stringz.fromStringz( pName ).dup; 
     575        String buffer = tango.stdc.stringz.fromStringz( pName ).dup; 
    576576        OS.g_free (pName); 
    577577        result[count++] = "GTKPRIMARYCLIPBOARD "~buffer; 
    578578    } 
    579579    if (count < result.length){ 
    580         char[][] temp = new char[][count]; 
     580        String[] temp = new String[count]; 
    581581        System.arraycopy(result, 0, temp, 0, count); 
    582582        result = temp; 
    …… 
    619619 
    620620GtkSelectionData* gtk_clipboard_wait_for_contents(void* clipboard, void* target) { 
    621     char[] key = "org.eclipse.swt.internal.gtk.dispatchEvent"; 
     621    String key = "org.eclipse.swt.internal.gtk.dispatchEvent"; 
    622622    Display display = this.display; 
    623623    ArrayWrapperInt arr = new ArrayWrapperInt( [ OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY ] );