From cc863104a7a7a33324b0a710703f0b70e200b8cf Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Mon, 19 Mar 2001 04:30:27 +0000 Subject: [PATCH] ... original commit: 6a6a6005e109bbc02ab2d76c84f8dbcdf78d7701 --- collects/framework/private/autosave.ss | 3 ++- collects/framework/private/canvas.ss | 2 +- collects/framework/private/editor.ss | 12 +++++---- collects/framework/private/frame.ss | 1 + collects/framework/private/group.ss | 1 + collects/framework/private/handler.ss | 5 ++-- collects/framework/private/keymap.ss | 26 ++++++++++++------- collects/framework/private/menu.ss | 3 ++- collects/framework/private/panel.ss | 1 + collects/framework/private/pasteboard.ss | 1 + collects/framework/private/path-utils.ss | 1 - collects/framework/private/preferences.ss | 7 +++-- collects/framework/private/scheme.ss | 1 + collects/framework/private/text.ss | 1 + .../tests/framework/framework-test-engine.ss | 2 +- 15 files changed, 43 insertions(+), 24 deletions(-) diff --git a/collects/framework/private/autosave.ss b/collects/framework/private/autosave.ss index e3e88b45..be9b3a3f 100644 --- a/collects/framework/private/autosave.ss +++ b/collects/framework/private/autosave.ss @@ -1,6 +1,7 @@ (module autosave mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig.ss" (lib "mred-sig.ss" "mred")) @@ -15,7 +16,7 @@ (define objects null) (define autosave-timer% - (class timer% () + (class100 timer% () (inherit start) (override [notify diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss index 4b4c9714..ea8dfa36 100644 --- a/collects/framework/private/canvas.ss +++ b/collects/framework/private/canvas.ss @@ -15,7 +15,7 @@ (define basic<%> (interface ((class->interface editor-canvas%)))) (define basic-mixin - (mixin ((class->interface editor-canvas%)) (basic<%>) args + (mixin ((class100->interface editor-canvas%)) (basic<%>) args (sequence (apply super-init args)))) diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss index 83973920..3f2d2a4a 100644 --- a/collects/framework/private/editor.ss +++ b/collects/framework/private/editor.ss @@ -1,6 +1,7 @@ (module editor mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig.ss" "../gui-utils-sig.ss" "../macro.ss" @@ -62,7 +63,7 @@ (rename [super-after-save-file after-save-file] [super-after-load-file after-load-file]) - (private + (private-field [last-saved-file-time #f]) (override [after-save-file @@ -94,7 +95,7 @@ (let ([ms (file-or-directory-modify-seconds fn)]) (< last-saved-file-time ms))))))]) - (private + (private-field [has-focus #f]) (rename [super-on-focus on-focus]) (override @@ -146,7 +147,7 @@ [edit-sequence-queue null] [edit-sequence-ht (make-hash-table)]) - (private + (private-field [in-local-edit-sequence? #f]) (public [local-edit-sequence? (lambda () in-local-edit-sequence?)] @@ -363,10 +364,11 @@ [super-on-change on-change] [super-on-close on-close] [super-set-modified set-modified]) - (private + (private-field [auto-saved-name #f] [auto-save-out-of-date? #t] - [auto-save-error? #f] + [auto-save-error? #f]) + (private [file-old? (lambda (filename) (if (and filename diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 60dbeae0..5aa8826e 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -1,6 +1,7 @@ (module frame mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") (lib "include.ss") "sig.ss" "../gui-utils-sig.ss" diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 3cb55c5f..a3739a29 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -1,6 +1,7 @@ (module group mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig.ss" (lib "mred-sig.ss" "mred") (lib "list.ss") diff --git a/collects/framework/private/handler.ss b/collects/framework/private/handler.ss index f138fae6..0066e7d3 100644 --- a/collects/framework/private/handler.ss +++ b/collects/framework/private/handler.ss @@ -1,6 +1,7 @@ (module handler mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig.ss" "../gui-utils-sig.ss" (lib "mred-sig.ss" "mred") @@ -125,8 +126,8 @@ (define *open-directory* ; object to remember last directory (make-object - (class object% () - (private + (class100 object% () + (private-field [the-dir #f]) (public [get (lambda () the-dir)] diff --git a/collects/framework/private/keymap.ss b/collects/framework/private/keymap.ss index 4037fce3..92f5489c 100644 --- a/collects/framework/private/keymap.ss +++ b/collects/framework/private/keymap.ss @@ -3,6 +3,7 @@ "sig.ss" "../macro.ss" (lib "class.ss") + (lib "class100.ss") (lib "list.ss") (lib "mred-sig.ss" "mred")) @@ -26,7 +27,7 @@ (define aug-keymap-mixin (mixin ((class->interface keymap%)) (aug-keymap<%>) args - (private + (private-field [chained-keymaps null]) (public [get-chained-keymaps @@ -42,7 +43,7 @@ (cons keymap chained-keymaps) (append chained-keymaps (list keymap)))))]) - (private [function-table (make-hash-table)]) + (private-field [function-table (make-hash-table)]) (public [get-function-table (lambda () function-table)]) (rename [super-map-function map-function]) (override @@ -773,7 +774,7 @@ (let ([frame (send edit get-frame)]) (if (and frame (is-a? frame frame:standard-menus<%>)) - ((ivar frame file-menu:quit)) + (send frame file-menu:quit) (bell))))) (add "ring-bell" ring-bell) @@ -994,7 +995,7 @@ (define setup-search (let* ([send-frame - (lambda (method) + (lambda (invoke-method) (lambda (edit event) (let ([frame (cond @@ -1006,7 +1007,7 @@ (send edit get-top-level-window)] [else #f])]) (if frame - ((ivar/proc frame method)) + (invoke-method frame) (bell))) #t))]) (lambda (kmap) @@ -1019,11 +1020,16 @@ [add-m (lambda (name func) (send kmap add-function name func))]) - (add "move-to-search-or-search" (send-frame 'move-to-search-or-search)) ;; key 1 - (add "move-to-search-or-reverse-search" (send-frame 'move-to-search-or-reverse-search)) ;; key 1b, backwards - (add "find-string-again" (send-frame 'search-again)) ;; key 2 - (add "toggle-search-focus" (send-frame 'toggle-search-focus)) ;; key 3 - (add "hide-search" (send-frame 'hide-search)) ;; key 4 + (add "move-to-search-or-search" + (send-frame (lambda (f) (send f move-to-search-or-search)))) ;; key 1 + (add "move-to-search-or-reverse-search" + (send-frame (lambda (f) (send f move-to-search-or-reverse-search)))) ;; key 1b, backwards + (add "find-string-again" + (send-frame (lambda (f) (send f search-again)))) ;; key 2 + (add "toggle-search-focus" + (send-frame (lambda (f) (send f toggle-search-focus)))) ;; key 3 + (add "hide-search" + (send-frame (lambda (f) (send f hide-search)))) ;; key 4 (case (system-type) [(unix) diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss index 2fc1d7d0..0b68a5a0 100644 --- a/collects/framework/private/menu.ss +++ b/collects/framework/private/menu.ss @@ -1,6 +1,7 @@ (module menu mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../macro.ss" (lib "mred-sig.ss" "mred")) @@ -19,7 +20,7 @@ (define can-restore-mixin (mixin (selectable-menu-item<%>) (can-restore<%>) args (inherit set-shortcut get-shortcut) - (private + (private-field [saved-shortcut 'not-yet]) (public [restore-keybinding diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index ac48124c..bdf54f94 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -1,6 +1,7 @@ (module panel mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../macro.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/pasteboard.ss b/collects/framework/private/pasteboard.ss index c8846ada..548a11d4 100644 --- a/collects/framework/private/pasteboard.ss +++ b/collects/framework/private/pasteboard.ss @@ -1,6 +1,7 @@ (module pasteboard mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../macro.ss" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/path-utils.ss b/collects/framework/private/path-utils.ss index 6ae95124..d9307562 100644 --- a/collects/framework/private/path-utils.ss +++ b/collects/framework/private/path-utils.ss @@ -1,6 +1,5 @@ (module path-utils mzscheme (require (lib "unitsig.ss") - (lib "class.ss") "sig" (lib "mred-sig.ss" "mred")) diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss index 031741db..9359ef5a 100644 --- a/collects/framework/private/preferences.ss +++ b/collects/framework/private/preferences.ss @@ -1,6 +1,7 @@ (module preferences mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../prefs-file-sig.ss" (lib "mred-sig.ss" "mred") @@ -580,7 +581,7 @@ (define make-preferences-dialog (lambda () (letrec ([frame - (make-object (class-asi frame% + (make-object (class100 frame% args (public [added-pane (lambda () @@ -592,7 +593,9 @@ (ppanel-panel (car (list-tail ppanels - (sub1 (length ppanels))))))))])) + (sub1 (length ppanels))))))))]) + (sequence + (apply super-init args))) "Preferences")] [panel (make-object vertical-panel% frame)] [popup-callback diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index ce9e54c4..7a447131 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -4,6 +4,7 @@ (module scheme mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../macro.ss" (lib "mred-sig.ss" "mred") diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index ff80c7d3..d89006ef 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -1,6 +1,7 @@ (module text mzscheme (require (lib "unitsig.ss") (lib "class.ss") + (lib "class100.ss") "sig" "../macro.ss" "../gui-utils-sig.ss" diff --git a/collects/tests/framework/framework-test-engine.ss b/collects/tests/framework/framework-test-engine.ss index 3c2a3652..941e9049 100644 --- a/collects/tests/framework/framework-test-engine.ss +++ b/collects/tests/framework/framework-test-engine.ss @@ -29,7 +29,7 @@ (collection-path "tests" "framework") "receive-sexps-port.ss"))]) (debug-printf tcp "about to connect to ~a~n" port) - (let*-values ([(in out) (tcp-connect "localhost" port)]) + (let*-values ([(in out) (tcp-connect "127.0.0.1" port)]) (let loop () (debug-printf tcp "about to read~n") (let ([sexp (read in)])