mred/private/wxme: fixed some method arities and defaults

svn: r14477

collects/mred/private/wxme/editor-admin.ss

@@ -39,7 +39,7 @@
                          [(symbol-in start none end) [bias 'none]])
     (void))
 
-  (def/public (grab-caret [(symbol-in immediate display global) dist])
+  (def/public (grab-caret [(symbol-in immediate display global) [dist 'global]])
     (void))
 
   (def/public (resized [any? redraw-now]) (void))

collects/mred/private/wxme/editor-canvas.ss

@@ -273,7 +273,7 @@
       (send blink-timer kill)
       (set! blink-timer #f))
     (send admin set-canvas #f)
-    #;(super ~))
+    #|(super ~)|#)
   
   (define/override (on-size w h)
     (unless noloop?
@@ -352,7 +352,7 @@
 
   (define/public (is-focus-on?) focuson?)
 
-  (define (force-display-focus on?)
+  (define/public (force-display-focus on?)
     (let ([old-on? focusforcedon?])
       (set! focusforcedon? on?)
       (send admin adjust-std-flag)
@@ -360,7 +360,6 @@
                          (or focuson? old-on?)))
         (refresh))))
 
-
   (define/override (on-event event)
     ;; Turn off auto-dragger, if there is one
     (when auto-dragger
@@ -493,7 +492,7 @@
                need-refresh?)
       (on-paint)))
 
-  (define (get-lazy-refresh) lazy-refresh?)
+  (define/public (get-lazy-refresh) lazy-refresh?)
 
   (define/public (set-custom-cursor cursor)
     (if (not cursor)
@@ -879,7 +878,7 @@
 
   (define/public (get-editor) media)
 
-  (define/public (set-editor m update?)
+  (define/public (set-editor m [update? #t])
     (unless (eq? media m)
       (when media
         (when (eq? admin (send media get-admin))
@@ -932,8 +931,8 @@
     (set! scroll-to-last? to-last?)
     (reset-visual #f)
     (repaint))
-  
+
-  (define (scroll-with-bottom-base bottom?)
+  (define/public (scroll-with-bottom-base bottom?)
     (set! scroll-bottom-based? bottom?)
     (reset-visual #f)
     (repaint)))

collects/mred/private/wxme/editor.ss

@@ -387,7 +387,7 @@
 
   ;; ----------------------------------------
 
-  (def/public (set-keymap [keymap% k])
+  (def/public (set-keymap [keymap% [k #f]])
     (set! s-keymap k))
   (def/public (get-keymap) s-keymap)
   (def/public (get-style-list) s-style-list)
@@ -481,7 +481,7 @@
 
   (define/public (really-can-edit?) #f)
 
-  (def/public (insert-box [symbol? type])
+  (def/public (insert-box [symbol? [type 'text]])
     (let ([snip (on-new-box type)])
       (when snip
         (let ([sname (default-style-name)])

collects/mred/private/wxme/pasteboard.ss

@@ -1734,7 +1734,7 @@
           (loop (snip->next snip))))
       (install-copy-buffer time sl)))
   
-  (def/override (copy [bool? extend?] [exact-integer? time])
+  (def/override (copy [bool? [extend? #f]] [exact-integer? [time 0]])
     (begin-copy-buffer)
     (when (not extend?)
       (free-old-copies))
@@ -1795,10 +1795,10 @@
           (do-paste time))
       (end-edit-sequence)))
   
-  (def/override (paste [exact-integer? time])
+  (def/override (paste [exact-integer? [time 0]])
     (generic-paste #f time))
 
-  (def/override (paste-x-selection [exact-integer? time])
+  (def/override (paste-x-selection [exact-integer? [time 0]])
     (generic-paste #t time))
 
   (define/override (insert-paste-snip snip data)
@@ -1812,7 +1812,7 @@
       (send snip insert str)
       (insert-paste-snip snip #f)))
   
-  (def/override (kill [exact-integer? time])
+  (def/override (kill [exact-integer? [time 0]])
     (cut time))
 
   (define/override (own-x-selection on? update? force?)
@@ -1912,7 +1912,8 @@
          (write-snips-to-file f s-style-list #f snips #f #f this)
          (do-write-headers-footers f #f)))
 
-  (def/override (read-from-file [editor-stream-in% f] [bool? overwritestyle?])
+  (def/override (read-from-file [editor-stream-in% f]
+                                [bool? [overwritestyle? #t]])
     (if (or s-user-locked? 
             (not (zero? write-locked)))
         #f

collects/mred/private/wxme/snip-admin.ss

@@ -19,7 +19,7 @@
     #f)
 
   (def/public (get-view [maybe-box? x] [maybe-box? y] [maybe-box? w] [maybe-box? h] 
-                        [(make-or-false snip%) snip])
+                        [(make-or-false snip%) [snip #f]])
     #f)
 
   (def/public (scroll-to [snip% s]

collects/mred/private/wxme/snip.ss

@@ -1073,9 +1073,9 @@
   (def/public (equal-to? [image-snip% other] [any? recur])
     (send other other-equal-to? this recur))
 
-  (def/public (other-equal-to? [image-snip% one] [image-snip% other] [any? recur])
+  (def/public (other-equal-to? [image-snip% other] [any? recur])
-    (let ([bm (send one get-bitmap)]
+    (let* ([bm (send this get-bitmap)]
-          [bm2 (send other get-bitmap)])
+           [bm2 (send other get-bitmap)])
       (and
        bm (send bm ok?)
        bm2 (send bm ok?)
@@ -1089,7 +1089,7 @@
                 [s2 (make-bytes (* w h 4))])
             (send bm get-argb-pixels 0 0 w h s1 #f)
             (send bm2 get-argb-pixels 0 0 w h s2 #f)
-            (let ([mask (send one get-bitmap-mask)])
+            (let ([mask (send this get-bitmap-mask)])
               (when (and mask
                          (send mask ok?)
                          (= w (send mask get-width))

collects/mred/private/wxme/style.ss

@@ -193,7 +193,8 @@
   (super-new)
   (set-delta change-command param)
 
-  (def/public (set-delta [symbol? change-command] [any? [param 0]])
+  (def/public (set-delta [symbol? [change-command 'change-nothing]]
+                         [any? [param 0]])
     (case change-command
       [(change-nothing)
        (set! family 'base)