# HG changeset patch # User Frank Benoit # Date 1215351690 -7200 # Node ID d472fae79005c6671bb08c35dd5736b428f14a72 # Parent 58ef057b3e9d89b7a8d41dd69c2138cd9a632a31 Fix: compile errors diff -r 58ef057b3e9d -r d472fae79005 dwt/custom/DefaultContent.d --- a/dwt/custom/DefaultContent.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/custom/DefaultContent.d Sun Jul 06 15:41:30 2008 +0200 @@ -23,7 +23,7 @@ import dwt.custom.StyledText; import dwt.dwthelper.utils; -version(TANGOSVN) +version(TANGOSVN) { static import tango.io.model.IFile; } else{ @@ -34,7 +34,7 @@ alias tango.text.Text.Text!(char) StringBuffer; class DefaultContent : StyledTextContent { -version(TANGOSVN) +version(TANGOSVN) { private final static String LineDelimiter = tango.io.model.IFile.FileConst.NewlineString; } else{ diff -r 58ef057b3e9d -r d472fae79005 dwt/custom/StyledText.d --- a/dwt/custom/StyledText.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/custom/StyledText.d Sun Jul 06 15:41:30 2008 +0200 @@ -85,7 +85,7 @@ static import tango.text.Text; static import tango.text.Util; -version(TANGOSVN) +version(TANGOSVN) { static import tango.io.model.IFile; } else{ diff -r 58ef057b3e9d -r d472fae79005 dwt/dwthelper/ByteArrayOutputStream.d --- a/dwt/dwthelper/ByteArrayOutputStream.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/dwthelper/ByteArrayOutputStream.d Sun Jul 06 15:41:30 2008 +0200 @@ -6,7 +6,7 @@ public import dwt.dwthelper.OutputStream; import dwt.dwthelper.utils; import tango.io.Buffer; -version(TANGOSVN) +version(TANGOSVN) { import tango.io.Buffer; } else{ diff -r 58ef057b3e9d -r d472fae79005 dwt/dwthelper/File.d --- a/dwt/dwthelper/File.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/dwthelper/File.d Sun Jul 06 15:41:30 2008 +0200 @@ -5,7 +5,7 @@ import dwt.dwthelper.utils; -version(TANGOSVN) +version(TANGOSVN) { static import tango.io.model.IFile; } else{ @@ -24,7 +24,7 @@ private tango.io.FilePath.FilePath mFilePath; static this(){ -version(TANGOSVN) +version(TANGOSVN) { separator = tango.io.model.IFile.FileConst.PathSeparatorString; separatorChar = tango.io.model.IFile.FileConst.PathSeparatorChar; pathSeparator = tango.io.model.IFile.FileConst.SystemPathString; diff -r 58ef057b3e9d -r d472fae79005 dwt/dwthelper/InflaterInputStream.d --- a/dwt/dwthelper/InflaterInputStream.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/dwthelper/InflaterInputStream.d Sun Jul 06 15:41:30 2008 +0200 @@ -7,7 +7,7 @@ import dwt.dwthelper.utils; import tango.io.Stdout; import tango.io.compress.ZlibStream; -version(TANGOSVN) +version(TANGOSVN) { import tango.io.Conduit; } class InputStreamWrapper : tango.io.model.IConduit.InputStream { @@ -22,7 +22,7 @@ int res = istr.read( cast(byte[])dst ); return res; } -version(TANGOSVN) +version(TANGOSVN) { void[] load (void[] dst = null) { return Conduit.load (this, dst); } diff -r 58ef057b3e9d -r d472fae79005 dwt/dwthelper/utils.d --- a/dwt/dwthelper/utils.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/dwthelper/utils.d Sun Jul 06 15:41:30 2008 +0200 @@ -149,7 +149,7 @@ } public static String toHexString( int i ){ -version(TANGOSVN) +version(TANGOSVN) { return tango.text.convert.Integer.toString(i, "x" ); } else{ @@ -158,7 +158,7 @@ } public static String toOctalString( int i ){ -version(TANGOSVN) +version(TANGOSVN) { return tango.text.convert.Integer.toString(i, "o" ); } else{ @@ -167,7 +167,7 @@ } public static String toBinaryString( int i ){ -version(TANGOSVN) +version(TANGOSVN) { return tango.text.convert.Integer.toString(i, "b" ); } else{ @@ -650,7 +650,7 @@ public alias tango.stdc.stringz.fromString16z fromString16z; static String toHex(uint value, bool prefix = true, int radix = 8){ -version(TANGOSVN) +version(TANGOSVN) { return tango.text.convert.Integer.toString( value, radix is 10 ? "d" : diff -r 58ef057b3e9d -r d472fae79005 dwt/widgets/DirectoryDialog.d --- a/dwt/widgets/DirectoryDialog.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/widgets/DirectoryDialog.d Sun Jul 06 15:41:30 2008 +0200 @@ -23,7 +23,7 @@ import dwt.widgets.Shell; import dwt.widgets.Display; -version(TANGOSVN) +version(TANGOSVN) { static import tango.io.model.IFile; } else{ @@ -51,7 +51,7 @@ */ public class DirectoryDialog : Dialog { String message = "", filterPath = ""; -version(TANGOSVN) +version(TANGOSVN) { static const String SEPARATOR = tango.io.model.IFile.FileConst.PathSeparatorString; } else{ diff -r 58ef057b3e9d -r d472fae79005 dwt/widgets/FileDialog.d --- a/dwt/widgets/FileDialog.d Sun Jul 06 15:37:36 2008 +0200 +++ b/dwt/widgets/FileDialog.d Sun Jul 06 15:41:30 2008 +0200 @@ -22,7 +22,7 @@ import dwt.widgets.Display; import dwt.dwthelper.utils; -version(TANGOSVN) +version(TANGOSVN) { static import tango.io.model.IFile; } else{ @@ -61,7 +61,7 @@ int filterIndex = -1; bool overwrite = false; GtkWidget* handle; -version(TANGOSVN) +version(TANGOSVN) { static final char SEPARATOR = tango.io.model.IFile.FileConst.PathSeparatorChar; } else{