From 230c4b5d152766fbf57c8e3cb688b1924cc07ab5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 15 Feb 1999 22:56:22 +0000
Subject: [PATCH] .

original commit: 889eee64c929fc6b0258ac8161f9a25ca6db732c
---
 collects/tests/mred/item.ss | 24 ++++++++++++++++++++++++
 collects/tests/mred/mem.ss  |  4 ++--
 src/mred/wrap/mred.ss       |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/collects/tests/mred/item.ss b/collects/tests/mred/item.ss
index bd0a6310..077a1640 100644
--- a/collects/tests/mred/item.ss
+++ b/collects/tests/mred/item.ss
@@ -1468,6 +1468,28 @@
   (send c2 set-vsize 500 200)
   (send f show #t))
 
+(define (editor-canvas-oneline-frame)
+  (define f (make-object frame% "x" #f 200 #f))
+  
+  (define (try flags)
+    (define c (make-object editor-canvas% f #f flags))
+    
+    (define e (make-object text%))
+    
+    (send e insert "Xy!")
+    
+    (send c set-line-count 1)
+    
+    (send c set-editor e)
+    (send c stretchable-height #f))
+  
+  (send f show #t)
+  
+  (try '(no-hscroll no-vscroll))
+  (try '(no-vscroll))
+  (try '(no-hscroll))
+  (try '()))
+
 ;----------------------------------------------------------------------
 
 (define selector (make-object frame% "Test Selector"))
@@ -1522,6 +1544,8 @@
 (make-object button% "Make Menus Frame" pp (lambda (b e) (menu-frame)))
 (make-object horizontal-pane% pp)
 (make-object button% "Make Panel Frame" pp (lambda (b e) (panel-frame)))
+(make-object horizontal-pane% pp)
+(make-object button% "Editor Canvas One-liners" pp (lambda (b e) (editor-canvas-oneline-frame)))
 (define bp (make-object horizontal-pane% ap))
 (send bp stretchable-width #f)
 (make-object button% "Make Button Frame" bp (lambda (b e) (button-frame frame% null)))
diff --git a/collects/tests/mred/mem.ss b/collects/tests/mred/mem.ss
index 13e72769..14d4fc72 100644
--- a/collects/tests/mred/mem.ss
+++ b/collects/tests/mred/mem.ss
@@ -151,11 +151,11 @@
 	      (let ([mb (make-object menu-bar% sub-collect-frame)])
 		(make-object menu% "Permanent" mb)))
 	    (let* ([mb (send sub-collect-frame get-menu-bar)]
-		   [mm (send (car (send mb get-items)) get-menu)])
+		   [mm (car (send mb get-items))])
 	      (send (remember tag (make-object menu-item% "Delete Me" mm void)) delete)
 	      (let ([m (make-object menu% "Temporary" mb)])
 		(remember tag (make-object menu-item% "Temp Hi" m void))
-		(send (send m get-item) delete)))))
+		(send m delete)))))
 	  	  
 	(when atomic?
 	  (let loop ([m 8])
diff --git a/src/mred/wrap/mred.ss b/src/mred/wrap/mred.ss
index 8f8c1582..56849779 100644
--- a/src/mred/wrap/mred.ss
+++ b/src/mred/wrap/mred.ss
@@ -3410,7 +3410,7 @@
 				      (memq 'hide-hscroll style))]
 			   [get-ds (lambda (no-this? no-other?)
 				     (cond
-				      [(and no-this? no-other?) 0]
+				      [(and no-this? no-other?) 14]
 				      [no-this? canvas-default-size]
 				      [else (+ 10 canvas-default-size)]))])
 		      (set! wx (make-object wx-editor-canvas% this this