Ticket #8 (closed enhancement: fixed)

Opened 3 months ago

Last modified 2 weeks ago

Tango FileConst Patch (for Tango 0.99.7)

Reported by: LordSauron Assigned to: keinfarbton
Priority: minor Milestone:
Component: DWT-Win Version:
Keywords: Cc:

Description

I found and fixed some pragma warnings for Tango 0.99.7 (which I was using the dev version of to get DDBI working). I've tested the changes and they do not appear to break anything else, though they will not work on pre-0.99.7 versions of DWT.

When you're ready to stop 0.99.6 support and switch over to 0.99.7 you might want to use this patch. I didn't want to attempt to commit, since I don't know if I have permission, and I'm not certain I want to risk breaking something without meaning to.

dwt\dwthelper\File.d has been modified in your working directory.
diff -r 51a84342d244 dwt/dwthelper/File.d
--- a/dwt/dwthelper/File.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/dwthelper/File.d	Wed Jun 04 21:59:46 2008 -0700
@@ -5,7 +5,7 @@ module dwt.dwthelper.File;
 
 import dwt.dwthelper.utils;
 
-static import tango.io.FileConst;
+static import tango.io.model.IFile;
 static import tango.io.FilePath;
 static import tango.io.FileSystem;
 
@@ -19,10 +19,10 @@ public class File {
     private tango.io.FilePath.FilePath mFilePath;
 
     static this(){
-        separator = tango.io.FileConst.FileConst.PathSeparatorString;
-        separatorChar = tango.io.FileConst.FileConst.PathSeparatorChar;
-        pathSeparator = tango.io.FileConst.FileConst.SystemPathString;
-        pathSeparatorChar = tango.io.FileConst.FileConst.SystemPathChar;
+        separator = tango.io.model.IFile.FileConst.PathSeparatorString;
+        separatorChar = tango.io.model.IFile.FileConst.PathSeparatorChar;
+        pathSeparator = tango.io.model.IFile.FileConst.SystemPathString;
+        pathSeparatorChar = tango.io.model.IFile.FileConst.SystemPathChar;
     }
 
     public this ( String pathname ){

dwt\custom\StyledTextRenderer.d has been modified in your working directory.
diff -r 51a84342d244 dwt/custom/StyledTextRenderer.d
--- a/dwt/custom/StyledTextRenderer.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/custom/StyledTextRenderer.d	Wed Jun 04 21:59:45 2008 -0700
@@ -42,7 +42,7 @@ import dwt.dwthelper.Runnable;
 
 static import tango.text.Text;
 static import tango.text.Util;
-static import tango.io.FileConst;
+static import tango.io.model.IFile;
 static import tango.text.convert.Utf;
 import tango.util.Convert;
 import dwt.dwthelper.utils;

dwt\custom\StyledText.d has been modified in your working directory.
diff -r 51a84342d244 dwt/custom/StyledText.d
--- a/dwt/custom/StyledText.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/custom/StyledText.d	Wed Jun 04 21:59:44 2008 -0700
@@ -85,7 +85,7 @@ import dwt.dwthelper.Runnable;
 
 static import tango.text.Text;
 static import tango.text.Util;
-static import tango.io.FileConst;
+static import tango.io.model.IFile;
 static import tango.text.convert.Utf;
 import tango.util.Convert;
 import dwt.dwthelper.utils;
@@ -149,7 +149,7 @@ public class StyledText : Canvas {
     alias Canvas.computeSize computeSize;
 
     static const char TAB = '\t';
-    static const String PlatformLineDelimiter = tango.io.FileConst.FileConst.NewlineString;
+    static const String PlatformLineDelimiter = tango.io.model.IFile.FileConst.NewlineString;
     static const int BIDI_CARET_WIDTH = 3;
     static const int DEFAULT_WIDTH  = 64;
     static const int DEFAULT_HEIGHT = 64;

dwt\custom\DefaultContent.d has been modified in your working directory.
diff -r 51a84342d244 dwt/custom/DefaultContent.d
--- a/dwt/custom/DefaultContent.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/custom/DefaultContent.d	Wed Jun 04 21:59:22 2008 -0700
@@ -22,14 +22,14 @@ import dwt.custom.StyledTextListener;
 import dwt.custom.StyledTextListener;
 import dwt.custom.StyledText;
 
-static import tango.io.FileConst;
+static import tango.io.model.IFile;
 static import tango.text.Text;
 import dwt.dwthelper.utils;
 
 alias tango.text.Text.Text!(char) StringBuffer;
 
 class DefaultContent : StyledTextContent {
-    private final static String LineDelimiter = tango.io.FileConst.FileConst.NewlineString;
+    private final static String LineDelimiter = tango.io.model.IFile.FileConst.NewlineString;
 
     StyledTextListener[] textListeners; // stores text listeners for event sending
     String textStore; // stores the actual text

Change History

06/06/08 18:23:28 changed by keinfarbton

Thanks for the patch.
I will use it as soon as tango 0.99.7 has been released.

08/22/08 09:35:08 changed by keinfarbton

  • status changed from new to closed.
  • resolution set to fixed.

was done