Changeset 24

Show
Ignore:
Timestamp:
02/10/11 22:36:34 (1 year ago)
Author:
yidabu
Message:

some changes for works with tango 0.99.9, dmd 1.056

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/import/htmlayout/events.d

    r18 r24  
    116116    { 
    117117        if(!del(dg)) return add(dg); 
     118        return false; 
    118119    } 
    119120 

  • trunk/import/htmlayout/graphin.d

    r17 r24  
    66import tango.text.convert.Utf; 
    77import tango.io.model.IConduit; 
    8 import tango.io.FileConduit; 
    9  
     8import tango.io.device.File; 
     9import htmlayout.htmlayout; //bug, not import this 
    1010class HImage 
    1111{ 
    …… 
    5757    bool save(char[] file,uint quality=0) 
    5858    { 
    59         FileConduit f; 
     59        File f; 
    6060        try 
    61             f=new FileConduit(file,FileConduit.WriteCreate); 
     61            f=new File(file,File.WriteCreate); 
    6262        catch(Object o) 
    6363            return false; 

  • trunk/import/htmlayout/htmlayout.d

    r18 r24  
    8585import tango.stdc.stringz; 
    8686import tango.text.convert.Utf; 
    87 import tango.io.File; 
    88 import tango.io.FileSystem; 
     87import tango.io.device.File; 
    8988import tango.io.FilePath; 
     89import tango.sys.Environment; 
    9090import tango.sys.win32.Types; 
    9191 
    …… 
    123123        char[] buf; 
    124124        scope(exit) delete buf; 
    125         try (buf=cast(char[])File(file).read()); 
     125        try (buf=cast(char[])File.get(file)); 
    126126        catch(Object o) 
    127127        { 
    …… 
    129129            return false; 
    130130        } 
    131         return loadHTML(FileSystem.toAbsolute(FilePath(file)).toString,buf); 
     131        return loadHTML((new FilePath(file)).absolute(tango.sys.Environment.Environment.cwd).toString,buf); 
    132132    } 
    133133    bool masterCSS(char[] data,bool append=true) 
    …… 
    230230 
    231231    bool loadHTML(char[] url,char[] data){return (lastResult=HTMLiteLoadHtmlFromMemory(mHandle,toString16z(.toString16(url)),cast(LPCBYTE)toStringz(data),data.length))==HPR_OK;} 
    232     bool loadHTML(char[] file){return HTMLiteLoadHtmlFromFile(mHandle,toString16z(.toString16(FileSystem.toAbsolute(FilePath(file)).toString)))==HPR_OK;} 
     232    bool loadHTML(char[] file){return HTMLiteLoadHtmlFromFile(mHandle,toString16z(.toString16((new FilePath(file)).absolute(tango.sys.Environment.Environment.cwd).toString)))==HPR_OK;} 
    233233    bool mediaType(char[] mediatype){return (lastResult=HTMLiteSetMediaType(mHandle,toStringz(mediatype)))==HPR_OK;} 
    234234 
    …… 
    325325        else return cast(bool)HTMLayoutLoadHtmlEx(mHandle,cast(LPCBYTE)(toStringz(data)),data.length,toString16z(.toString16(url))); 
    326326    } 
    327     bool loadHTML(char[] file){return cast(bool)HTMLayoutLoadFile(mHandle,toString16z(.toString16(FileSystem.toAbsolute(FilePath(file)).toString)));} 
     327    bool loadHTML(char[] file){return cast(bool)HTMLayoutLoadFile(mHandle,toString16z(.toString16((new FilePath(file)).absolute(tango.sys.Environment.Environment.cwd).toString)));} 
    328328    bool mediaType(char[] mediatype){return true;return cast(bool)HTMLayoutSetMediaType(mHandle,toString16z(toString16(mediatype)));} 
    329329