--- a/dwt/dwthelper/Loader.d	Sat Apr 26 10:01:30 2008 +0200
+++ b/dwt/dwthelper/Loader.d	Mon May 05 00:42:55 2008 +0200
@@ -20,6 +20,8 @@
 
 module dwt.dwthelper.Loader;
 
+import dwt.dwthelper.utils;
+
 private import  tango.io.Stdout,
                 tango.sys.SharedLib;
                 
@@ -57,7 +59,7 @@
 
 version (Windows)
 {
-    const char[][LIBRARY.max+1] importLibs = [
+    const String[LIBRARY.max+1] importLibs = [
         LIBRARY.ATK:            "libatk-1.0-0.dll",
         LIBRARY.CAIRO:          "libcairo-2.dll",
         LIBRARY.GDK:            "libgdk-win32-2.0-0.dll",
@@ -86,7 +88,7 @@
 
 version(linux)
 {
-    const char[][LIBRARY.max+1] importLibs = [
+    const String[LIBRARY.max+1] importLibs = [
         LIBRARY.ATK:            "libatk-1.0.so",
         LIBRARY.CAIRO:          "libcairo.so.2",
         LIBRARY.GDK:            "libgdk-x11-2.0.so",
@@ -119,7 +121,7 @@
 
 version(Windows)
 {
-    char[] getLibraryPath()
+    String getLibraryPath()
     {
             return "\\Program Files\\GTK2-Runtime\\lib\\";
     }
@@ -133,7 +135,7 @@
 
 version(linux)
 {
-    char[] getLibraryPath() { return ""; }
+    String getLibraryPath() { return ""; }
 }
 
 /*****************************************************************************
@@ -145,7 +147,7 @@
 
 public struct Symbol
 {
-    char[]  name;
+    String  name;
     void**  pointer;
 }
 
@@ -157,7 +159,7 @@
 
 public class Linker
 {
-    static char[][][char[]] loadFailures;
+    static String[][String] loadFailures;
 
     /*************************************************************************
 
@@ -169,7 +171,7 @@
 
     **************************************************************************/
 
-    public static char[][] getLoadFailures(char[] libName)
+    public static String[] getLoadFailures(String libName)
     {
         if ( libName in loadFailures )
         {
@@ -190,7 +192,7 @@
 
     **************************************************************************/
 
-    public static char[][] getLoadLibraries()
+    public static String[] getLoadLibraries()
     {
         return loadFailures.keys;
     }
@@ -213,9 +215,9 @@
 
     public static void dumpFailedLoads()
     {
-        foreach ( char[] lib ; Linker.getLoadLibraries() )
+        foreach ( String lib ; Linker.getLoadLibraries() )
         {
-            foreach ( char[] symbol ; Linker.getLoadFailures(lib) )
+            foreach ( String symbol ; Linker.getLoadFailures(lib) )
             {
                 version(Tango)
                     Stdout.formatln("failed ({}) {}", lib, symbol).newline;
@@ -230,10 +232,10 @@
     private SharedLib primaryLib;
     private SharedLib alternateLib;
 
-    private char[]  libraryName;
-    private char[]  alternateLibraryName;
+    private String  libraryName;
+    private String  alternateLibraryName;
 
-    alias void function( char[] libraryName, char[] symbolName, char[] message=null) FailureCallback;
+    alias void function( String libraryName, String symbolName, String message=null) FailureCallback;
 
     private FailureCallback onLoadFailure;
 
@@ -241,7 +243,7 @@
 
     **************************************************************************/
 
-    this( char[] libraryName, char[] alternateLibraryName=null )
+    this( String libraryName, String alternateLibraryName=null )
     {
         this(libraryName, alternateLibraryName, &(Linker.defaultFail));
     }
@@ -250,7 +252,7 @@
 
     **************************************************************************/
 
-    this (char[] libraryName, char[] alternateLibraryName, FailureCallback fn )
+    this (String libraryName, String alternateLibraryName, FailureCallback fn )
     {
         this.libraryName = libraryName;
         this.alternateLibraryName = alternateLibraryName;
@@ -283,11 +285,11 @@
 
     **************************************************************************/
 
-    static void defaultFail( char[] libraryName, char[] symbolName, char[] message=null )
+    static void defaultFail( String libraryName, String symbolName, String message=null )
     {
         if ( !(libraryName in loadFailures) )
         {
-            char[][] cc;
+            String[] cc;
             loadFailures[libraryName] = cc;
         }