diff --git a/collects/mred/edit.ss b/collects/mred/edit.ss index 7edd3662..575fff41 100644 --- a/collects/mred/edit.ss +++ b/collects/mred/edit.ss @@ -1,8 +1,6 @@ -(define mred:edit@ (unit/sig mred:edit^ - (import [mred:debug : mred:debug^] - [mred:connections : mred:connections^] + (import [mred:connections : mred:connections^] [mred:finder : mred:finder^] [mred:path-utils : mred:path-utils^] [mred:mode : mred:mode^] @@ -43,7 +41,6 @@ (inherit modified? get-filename save-file canvases get-max-width get-admin) (rename - [super-set-filename set-filename] [super-set-modified set-modified] [super-on-change on-change] [super-on-save-file on-save-file] @@ -133,14 +130,7 @@ (delete-file auto-saved-name) (set! auto-saved-name #f)) (set! auto-save-out-of-date? #t))) - (super-set-modified modified?) - (for-each (lambda (canvas) (send canvas edit-modified modified?)) - canvases))] - [set-filename - (opt-lambda (name [temp? #f]) - (super-set-filename name temp?) - (for-each (lambda (canvas) (send canvas edit-renamed name)) - canvases))] + (super-set-modified modified?))] [on-change (lambda () @@ -234,9 +224,11 @@ [super-after-insert after-insert] [super-after-delete after-delete] [super-after-set-size-constraint after-set-size-constraint]) + (private [styles-fixed-edit-modified? #f] - [restore-file-format void]) + [restore-file-format void]) + (public [move/copy-to-edit (lambda (dest-edit start end dest-position) @@ -398,7 +390,7 @@ (when mode (send mode after-set-position this)) (super-after-set-position))]) - + (private [range-rectangles null] [recompute-range-rectangles @@ -548,6 +540,7 @@ (send dc set-pen old-pen) (send dc set-brush old-brush)))) range-rectangles))]) + (public [find-string-embedded (opt-lambda (str [direction 1] [start -1] @@ -656,4 +649,4 @@ (define return-edit% (make-return-edit% edit%)) (define make-pasteboard% make-std-buffer%) - (define pasteboard% (make-pasteboard% mred:connections:connections-media-pasteboard%)))) + (define pasteboard% (make-pasteboard% mred:connections:connections-media-pasteboard%))) diff --git a/collects/mred/exit.ss b/collects/mred/exit.ss index e7cc5684..a3c0e0d3 100644 --- a/collects/mred/exit.ss +++ b/collects/mred/exit.ss @@ -1,7 +1,6 @@ -(define mred:exit@ + (unit/sig mred:exit^ - (import [mred:debug : mred:debug^] - [mred:preferences : mred:preferences^] + (import [mred:preferences : mred:preferences^] [mred:gui-utils : mred:gui-utils^]) (rename (-exit exit)) @@ -55,6 +54,6 @@ (if (null? exit-callbacks) (exit) #f))) - (lambda () (set! exiting? #f))))))))) + (lambda () (set! exiting? #f)))))))) diff --git a/collects/mred/finder.ss b/collects/mred/finder.ss index d5af4d0e..d34f2ae9 100644 --- a/collects/mred/finder.ss +++ b/collects/mred/finder.ss @@ -1,8 +1,6 @@ -(define mred:finder@ (unit/sig mred:finder^ - (import [mred:debug : mred:debug^] - [mred:container : mred:container^] + (import [mred:container : mred:container^] [mred:preferences : mred:preferences^] [mred:gui-utils : mred:gui-utils^] [mred:edit : mred:edit^] @@ -550,4 +548,4 @@ (apply (case (mred:preferences:get-preference 'mred:file-dialogs) [(std) std-get-file] [(common) common-get-file]) - args))))) + args)))) diff --git a/collects/mred/keys.ss b/collects/mred/keys.ss index e7989d7e..abd3acc9 100644 --- a/collects/mred/keys.ss +++ b/collects/mred/keys.ss @@ -1,7 +1,6 @@ -(define mred:keymap@ + (unit/sig mred:keymap^ - (import [mred:debug : mred:debug^] - [mred:preferences : mred:preferences^] + (import [mred:preferences : mred:preferences^] [mred:exit : mred:exit^] [mred:finder : mred:finder^] [mred:handler : mred:handler^] @@ -908,4 +907,4 @@ (define global-keymap (make-object wx:keymap%)) - (setup-global-keymap global-keymap))) \ No newline at end of file + (setup-global-keymap global-keymap)) \ No newline at end of file diff --git a/collects/mred/panel.ss b/collects/mred/panel.ss index a7a08911..a3d115c8 100644 --- a/collects/mred/panel.ss +++ b/collects/mred/panel.ss @@ -1,7 +1,6 @@ -(define mred:panel@ + (unit/sig mred:panel^ - (import [mred:debug : mred:debug^] - [mred:container : mred:container^] + (import [mred:container : mred:container^] [mred:canvas : mred:canvas^] mzlib:function^) @@ -75,4 +74,4 @@ (define horizontal-edit-panel% (make-edit-panel% mred:container:horizontal-panel%)) (define vertical-edit-panel% - (make-edit-panel% mred:container:vertical-panel%)))) \ No newline at end of file + (make-edit-panel% mred:container:vertical-panel%))) \ No newline at end of file diff --git a/collects/mred/prefs.ss b/collects/mred/prefs.ss index d63760d4..a4099b79 100644 --- a/collects/mred/prefs.ss +++ b/collects/mred/prefs.ss @@ -1,9 +1,7 @@ ;; need a preference for pconvert -(define mred:preferences@ (unit/sig mred:preferences^ - (import [mred:debug : mred:debug^] - [mred:exn : mred:exn^] + (import [mred:exn : mred:exn^] [mred : mred:container^] ;; warning -- to use the mred:panel macros, ;; need to have mred:container be prefixed with "mred" [mred:exit : mred:exit^] @@ -15,14 +13,6 @@ (mred:debug:printf 'invoke "mred:preferences@") (define preferences-filename (wx:find-path 'pref-file)) - #| - (define preferences-filename - (build-path (wx:find-directory 'pref) - (case wx:platform - [(unix) ".mred.prefs"] - [(macintosh) "MrEd Preferences"] - [else "mred.pre"]))) - |# (define preferences (make-hash-table)) (define marshall-unmarshall (make-hash-table)) @@ -358,4 +348,4 @@ (begin0 (make-preferences-dialog) (cursor-off))))))))))) - (read-user-preferences))) + (read-user-preferences))