From defae7acaad10b85717b50837385baf65aeed82b Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 19 Feb 2004 20:35:34 +0000
Subject: [PATCH] .

original commit: 8ce11627dc7aa32453bdc564d8134d6a2a242ee4
---
 collects/mred/mred-sig.ss       |  4 ++--
 collects/mred/mred.ss           | 13 +++++++------
 collects/mred/private/kernel.ss |  2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/collects/mred/mred-sig.ss b/collects/mred/mred-sig.ss
index 33d8cf14..48006765 100644
--- a/collects/mred/mred-sig.ss
+++ b/collects/mred/mred-sig.ss
@@ -54,10 +54,10 @@
      editor-snip-editor-admin<%>
      editor-stream-in%
      editor-stream-in-base%
-     editor-stream-in-string-base%
+     editor-stream-in-bytes-base%
      editor-stream-out%
      editor-stream-out-base%
-     editor-stream-out-string-base%
+     editor-stream-out-bytes-base%
      editor-wordbreak-map%
      editor<%>
      end-busy-cursor
diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index f31917f5..6b5be4aa 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -6507,7 +6507,7 @@
 				 (let ([v (send dir-text get-value)])
 				   (if (or dir? (directory-exists? v))
 				       (begin
-					 (set! dir v)
+					 (set! dir (string->path v))
 					 (reset-directory))
 				       ;; Maybe specifies a file:
 				       (let-values ([(super file) 
@@ -6571,8 +6571,8 @@
 						    (lambda (b e)
 						      (send f show #f)
 						      (done))))]
-		 [path-string-locale<? (lambda (p)
-					 (string-locale<? (path->string p)))]
+		 [path-string-locale<? (lambda (p1 p2)
+					 (string-locale<? (path->string p1) (path->string p2)))]
 		 [reset-directory (lambda ()
 				    (wx:begin-busy-cursor)
                                     (let ([dir-exists? (directory-exists? dir)])
@@ -6594,7 +6594,8 @@
 				      (let-values ([(ds fs)
 						    (let loop ([l l][ds null][fs null])
 						      (cond
-						       [(null? l) (values (cons ".." (quicksort ds path-string-locale<?)) 
+						       [(null? l) (values (cons (string->path "..")
+										(quicksort ds path-string-locale<?)) 
 									  (quicksort fs path-string-locale<?))]
 						       [(and (not dot?) 
 							     (char=? (string-ref (path->string (car l)) 0) #\.)) 
@@ -6603,7 +6604,7 @@
 						       [else (loop (cdr l) (cons (car l) ds) fs)]))])
 					(set! dir-paths ds)
 					(send dirs set (map path->string ds))
-					(set! file-paths ds)
+					(set! file-paths fs)
 					(send files set (map path->string fs))
 					(send dirs enable #t)
 					(unless dir?
@@ -6775,7 +6776,7 @@
 					       (and (positive? (string-length a))
 						    (not (or (char-alphabetic? (string-ref a 0))
 							     (char-numeric? (string-ref a 0))
-							     (char=? #\- (string-ref a))))))])
+							     (char=? #\- (string-ref a 0))))))])
 				  ;; Sort space-starting first (for Xft), and
 				  ;;  otherwise push names that start with an
 				  ;;  ASCII non-letter/digit/hyphen to the end
diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss
index b41b91b8..b8a1d353 100644
--- a/collects/mred/private/kernel.ss
+++ b/collects/mred/private/kernel.ss
@@ -362,6 +362,7 @@
     on-event
     on-paint)
   (define-private-class dc% dc<%> object% #f
+    glyph-exists?
     end-page
     end-doc
     start-page
@@ -519,6 +520,7 @@
     on-set-focus
     on-kill-focus)
   (define-class font% object% #f
+    screen-glyph-exists?
     get-font-id
     get-size-in-pixels
     get-underlined