--- a/dwt/accessibility/AccessibleFactory.d	Sat Apr 26 10:01:30 2008 +0200
+++ b/dwt/accessibility/AccessibleFactory.d	Mon May 05 00:42:55 2008 +0200
@@ -12,6 +12,8 @@
  *******************************************************************************/
 module dwt.accessibility.AccessibleFactory;
 
+import dwt.dwthelper.utils;
+
 
 import dwt.internal.accessibility.gtk.ATK;
 import dwt.internal.gtk.OS;
@@ -35,14 +37,14 @@
     //Callback gTypeInfo_base_init_factory;
     Accessible[GtkWidget*] accessibles;
 
-    static long[char[]] Types;
+    static long[String] Types;
     static AccessibleFactory[long] Factories;
 
     static uint DefaultParentType; //$NON-NLS-1$
-    static const char[] FACTORY_PARENTTYPENAME = "AtkObjectFactory";
-    static const char[] SWT_TYPE_PREFIX = "DWT";
-    static const char[] CHILD_TYPENAME = "Child";
-    static const char[] FACTORY_TYPENAME = "SWTFactory";
+    static const String FACTORY_PARENTTYPENAME = "AtkObjectFactory";
+    static const String SWT_TYPE_PREFIX = "DWT";
+    static const String CHILD_TYPENAME = "Child";
+    static const String FACTORY_TYPENAME = "SWTFactory";
     static const int[] actionRoles = [
         ACC.ROLE_CHECKBUTTON, ACC.ROLE_COMBOBOX, ACC.ROLE_LINK,
         ACC.ROLE_MENUITEM, ACC.ROLE_PUSHBUTTON, ACC.ROLE_RADIOBUTTON,
@@ -96,7 +98,7 @@
 
     private this (int /*long*/ widgetType) {
         widgetTypeName = OS.g_type_name (widgetType);
-        char[] factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ \0;
+        String factoryName = FACTORY_TYPENAME ~ fromStringz( widgetTypeName ) ~ \0;
         if (OS.g_type_from_name (factoryName.ptr) is 0) {
             /* register the factory */
             auto registry = ATK.atk_get_default_registry ();
@@ -138,7 +140,7 @@
                 if (accessible.accessibleObject !is null) {
                     return accessible.accessibleObject.handle;
                 }
-                char[] buffer = fromStringz( widgetTypeName ).dup;
+                String buffer = fromStringz( widgetTypeName ).dup;
                 auto type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF);
                 AccessibleObject object = new AccessibleObject (type, cast(GtkWidget*)widget, accessible, objectParentType, false);
                 accessible.accessibleObject = object;
@@ -158,7 +160,7 @@
         return DefaultParentType;
     }
 
-    static int /*long*/ getType (char[] widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) {
+    static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) {
         AccessibleControlEvent event = new AccessibleControlEvent (accessible);
         event.childID = childId;
         AccessibleControlListener[] listeners = accessible.getControlListeners ();
@@ -194,7 +196,7 @@
         } else {
             action = hypertext = selection = text = true;
         }
-        char[] swtTypeName = SWT_TYPE_PREFIX.dup;
+        String swtTypeName = SWT_TYPE_PREFIX.dup;
         swtTypeName ~= widgetTypeName;
         if (action) swtTypeName ~= "Action"; //$NON-NLS-1$
         if (hypertext) swtTypeName ~= "Hypertext"; //$NON-NLS-1$