--- a/FileBrowser.st	Tue Apr 29 14:12:51 1997 +0200
+++ b/FileBrowser.st	Tue Apr 29 21:10:46 1997 +0200
@@ -461,7 +461,7 @@
                 Object abortSignal catch:[
                     |p|
 
-                    p := (here , '/' ,fileName).
+                    p := here asFilename constructString:fileName.
                     "/
                     "/ look if already loaded ...  then unload first
                     "/
@@ -496,7 +496,7 @@
                     or:[(fileName endsWith:'.cla')
                     or:[(fileName endsWith:'.CLA')]]) ifTrue:[
                         JavaClassReader notNil ifTrue:[
-                            JavaClassReader loadFile:(currentDirectory pathName , '/' , fileName)
+                            JavaClassReader loadFile:(currentDirectory pathName asFilename constructString:fileName)
                         ]
                     ] ifFalse:[
                         aStream := FileStream readonlyFileNamed:fileName in:currentDirectory.
@@ -817,7 +817,7 @@
     any := false.
     self selectedFilesDo:[:fileName |
         (currentDirectory isDirectory:fileName) ifTrue:[
-            self class openOn:(currentDirectory pathName , '/' , fileName).
+            self class openOn:(currentDirectory pathName asFilename constructString:fileName).
             any := true
         ]
     ].
@@ -953,7 +953,7 @@
 
     self selectedFilesDo:[:fileName |
         (currentDirectory isDirectory:fileName) ifFalse:[
-            img := Image fromFile:(currentDirectory pathName , '/' , fileName).
+            img := Image fromFile:(currentDirectory pathName asFilename constructString:fileName).
             img notNil ifTrue:[
                 img inspect
             ] ifFalse:[
@@ -978,7 +978,7 @@
 
     self selectedFilesDo:[:fileName |
         (currentDirectory isDirectory:fileName) ifFalse:[
-            aToolClass openOn:(currentDirectory pathName , '/' , fileName).
+            aToolClass openOn:(currentDirectory pathName asFilename constructString:fileName).
         ]
     ].
 
@@ -1538,7 +1538,7 @@
     "setup and launch a querybox to ask for unix command.
      Then evaluate aBlock passing the command-string as argument."
 
-    |sel box|
+    |box|
 
     box := FilenameEnterBox 
                 title:(resources at:'execute unix command:')
@@ -1661,7 +1661,7 @@
     "for some binary files, if double clicked, we can do some useful
      action ..."
 
-    (currentDirectory pathName , '/' , aFilename) asFilename isExecutable ifTrue:[
+    (currentDirectory pathName asFilename construct:aFilename) isExecutable ifTrue:[
         (OperatingSystem executeCommand:'cd ',currentDirectory pathName, '; ',aFilename)
         ifTrue:[^true].
     ].
@@ -1853,7 +1853,7 @@
 
     (Image isImageFileSuffix:(aFilename asFilename suffix))
     ifTrue:[
-        img := Image fromFile:(currentDirectory pathName , '/' , aFilename).
+        img := Image fromFile:(currentDirectory pathName asFilename construct:aFilename).
         img notNil ifTrue:[
             img inspect.
             ^ true
@@ -1989,7 +1989,7 @@
 
     |fullPath lcName|
 
-    fullPath := currentDirectory pathName , '/' , aFilename.
+    fullPath := currentDirectory pathName asFilename constructString:aFilename.
     lcName := aFilename asLowercase.
     ((lcName endsWith:'.htm') or:[lcName endsWith:'.html']) ifTrue:[
         HTMLDocumentView openOn:fullPath.
@@ -2263,7 +2263,7 @@
      bytes of a textFile"
 
     |n "{Class: SmallInteger }"
-     binary idx s w w2|
+     binary idx s w|
 
     binary := false.
     n := aBuffer size.
@@ -2641,7 +2641,7 @@
 
     type := info type.
     (longInfo and:[type == #regular]) ifTrue:[
-        fullPath := currentDirectory pathName , '/' , fileName.
+        fullPath := currentDirectory pathName asFilename constructString:fileName.
         fileOutput := fullPath asFilename fileType.
     ].
 
@@ -3076,7 +3076,7 @@
 iconForFile:aFilenameString
     "given a fileName, return an appropriate icon"
 
-    |f suff i key|
+    |f i key|
 
     f := currentDirectory asFilename construct:aFilenameString.
     f isDirectory ifTrue:[
@@ -3501,6 +3501,6 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.154 1997-04-28 20:32:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.155 1997-04-29 19:10:46 cg Exp $'
 ! !
 FileBrowser initialize!