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/accessibility/AccessibleFactory.d

    r158 r238  
    1313module dwt.accessibility.AccessibleFactory; 
    1414 
     15import dwt.dwthelper.utils; 
     16 
    1517 
    1618import dwt.internal.accessibility.gtk.ATK; 
    …… 
    3638    Accessible[GtkWidget*] accessibles; 
    3739 
    38     static long[char[]] Types; 
     40    static long[String] Types; 
    3941    static AccessibleFactory[long] Factories; 
    4042 
    4143    static uint DefaultParentType; //$NON-NLS-1$ 
    42     static const char[] FACTORY_PARENTTYPENAME = "AtkObjectFactory"; 
    43     static const char[] SWT_TYPE_PREFIX = "DWT"; 
    44     static const char[] CHILD_TYPENAME = "Child"; 
    45     static const char[] FACTORY_TYPENAME = "SWTFactory"; 
     44    static const String FACTORY_PARENTTYPENAME = "AtkObjectFactory"; 
     45    static const String SWT_TYPE_PREFIX = "DWT"; 
     46    static const String CHILD_TYPENAME = "Child"; 
     47    static const String FACTORY_TYPENAME = "SWTFactory"; 
    4648    static const int[] actionRoles = [ 
    4749        ACC.ROLE_CHECKBUTTON, ACC.ROLE_COMBOBOX, ACC.ROLE_LINK, 
    …… 
    9799    private this (int /*long*/ widgetType) { 
    98100        widgetTypeName = OS.g_type_name (widgetType); 
    99         char[] factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ \0; 
     101        String factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ \0; 
    100102        if (OS.g_type_from_name (factoryName.ptr) is 0) { 
    101103            /* register the factory */ 
    …… 
    139141                    return accessible.accessibleObject.handle; 
    140142                } 
    141                 char[] buffer = fromStringz( widgetTypeName ).dup; 
     143                String buffer = fromStringz( widgetTypeName ).dup; 
    142144                auto type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF); 
    143145                AccessibleObject object = new AccessibleObject (type, cast(GtkWidget*)widget, accessible, objectParentType, false); 
    …… 
    159161    } 
    160162 
    161     static int /*long*/ getType (char[] widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { 
     163    static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { 
    162164        AccessibleControlEvent event = new AccessibleControlEvent (accessible); 
    163165        event.childID = childId; 
    …… 
    195197            action = hypertext = selection = text = true; 
    196198        } 
    197         char[] swtTypeName = SWT_TYPE_PREFIX.dup; 
     199        String swtTypeName = SWT_TYPE_PREFIX.dup; 
    198200        swtTypeName ~= widgetTypeName; 
    199201        if (action) swtTypeName ~= "Action"; //$NON-NLS-1$