From c5960208a5f1b6a38bdf2f1ce6084329dd1b20d0 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 7 Jan 2003 17:35:38 +0000
Subject: [PATCH] ..

original commit: a6ad08b9da43d70a1f9624af938dc522bb1080ce
---
 collects/framework/private/autosave.ss    | 2 +-
 collects/framework/private/editor.ss      | 6 ++++--
 collects/framework/private/frame.ss       | 8 ++++----
 collects/framework/private/handler.ss     | 4 +++-
 collects/framework/private/main.ss        | 1 +
 collects/framework/private/panel.ss       | 1 -
 collects/framework/private/preferences.ss | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss
index 955e7bd7..ab22b8fc 100644
--- a/collects/framework/private/autosave.ss
+++ b/collects/framework/private/autosave.ss
@@ -244,7 +244,7 @@
 				     (format (string-constant autosave-error-deleting)
 					     autosave-file
 					     (if (exn? exn)
-						 (exn-message exn)
+						 (format "~a" (exn-message exn))
 						 (format "~s" exn))))
 				    #f)])
 		   (delete-file autosave-file)
diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss
index 4ee7c8c7..6f9ce5ea 100644
--- a/collects/framework/private/editor.ss
+++ b/collects/framework/private/editor.ss
@@ -108,7 +108,9 @@
 	    (let ([sp (open-output-string)])
 	      (parameterize ([current-output-port sp])
 		((error-display-handler)
-		 (if (exn? exn) (exn-message exn) (format "uncaught exn: ~s" exn))
+		 (if (exn? exn)
+		     (format "~a" (exn-message exn))
+		     (format "uncaught exn: ~s" exn))
 		 exn))
 	      (get-output-string sp)))
 
@@ -501,7 +503,7 @@
 	      (string-constant autosaving-turned-off)
 	      "\n\n"
 	      (if (exn? exn)
-		  (exn-message exn)
+		  (format "~a" (exn-message exn))
 		  (format "~s" exn)))
 	     #f
 	     '(caution ok)))
diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 0aeb48fd..940da2a6 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -253,19 +253,19 @@
           (define/override (on-paint)
             (let* ([dc (get-dc)]
                    [draw
-                    (lambda (str bg-color bg-style line-color)
+                    (lambda (str bg-color bg-style line-color line-style)
                       (send dc set-font lock-canvas-font)
                       (let-values ([(w h) (get-client-size)]
                                    [(tw th ta td) (send dc get-text-extent str)])
-                        (send dc set-pen (send the-pen-list find-or-create-pen line-color 1 'solid))
+                        (send dc set-pen (send the-pen-list find-or-create-pen line-color 1 line-style))
                         (send dc set-brush (send the-brush-list find-or-create-brush bg-color bg-style))
                         (send dc draw-rectangle 0 0 w h)
                         (send dc draw-text str
                               (- (/ w 2) (/ tw 2))
                               (- (/ h 2) (/ th 2)))))])
               (if locked?
-                  (draw locked-message "yellow" 'solid "black")
-                  (draw unlocked-message (get-panel-background) 'panel (get-panel-background)))))
+                  (draw locked-message "yellow" 'solid "black" 'solid)
+                  (draw unlocked-message (get-panel-background) 'panel (get-panel-background) 'transparent))))
           (inherit get-parent min-width min-height stretchable-width stretchable-height)
           (super-instantiate ())
           (let ([dc (get-dc)])
diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss
index c6762726..c75ab825 100644
--- a/collects/framework/private/handler.ss
+++ b/collects/framework/private/handler.ss
@@ -120,7 +120,9 @@
 				       (or filename
 					   (string-constant unknown-filename)))
 			       "\n\n"
-			       (if (exn? exn) (exn-message exn) (format "~s" exn))))
+			       (if (exn? exn)
+				   (format "~a" (exn-message exn))
+				   (format "~s" exn))))
 			     #f)])
 	    (gui-utils:show-busy-cursor
 	     (lambda ()
diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss
index 73324d59..d3790d35 100644
--- a/collects/framework/private/main.ss
+++ b/collects/framework/private/main.ss
@@ -73,6 +73,7 @@
                      define-syntax-set
 		     define-values
                      define/public define/override define/private define/field
+                     define/override-final define/public-final
 		     define-signature 
                      define-syntax define-syntaxes
                      define-schema define/contract))
diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss
index c799e093..54470c6a 100644
--- a/collects/framework/private/panel.ss
+++ b/collects/framework/private/panel.ss
@@ -2,7 +2,6 @@
 (module panel mzscheme
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
-	   (lib "class100.ss")
 	   "sig.ss"
 	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred")
diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss
index 08d14758..1c5646d9 100644
--- a/collects/framework/private/preferences.ss
+++ b/collects/framework/private/preferences.ss
@@ -63,7 +63,7 @@
                           (raise exn)))
                        (message-box (format (string-constant error-unmarshalling) p)
                                     (if (exn? exn)
-                                        (exn-message exn)
+                                        (format "~a" (exn-message exn))
                                         (format "~s" exn)))))))))
       
       ;; get-callbacks : sym -> (listof (-> void))