From de957292f40e36ea0857e01fbf9b600038b75c3f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 29 Apr 2007 02:08:24 +0000 Subject: [PATCH] 369.11 svn: r6085 original commit: e9bf34f1930103f62651e3ec5cbf35b791d097c6 --- collects/framework/private/group.ss | 4 +++- collects/mred/private/kernel.ss | 1 + collects/mred/private/mrtop.ss | 1 + collects/tests/mred/editor.ss | 29 +++++++++++++++++++++++++++++ doc/release-notes/mred/HISTORY | 5 +++++ 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/collects/framework/private/group.ss b/collects/framework/private/group.ss index 863bee39..ba41b004 100644 --- a/collects/framework/private/group.ss +++ b/collects/framework/private/group.ss @@ -94,7 +94,9 @@ (new menu:can-restore-menu-item% [label (string-constant zoom)] [parent menu] - [callback (λ (x y) (send (send (send menu get-parent) get-frame) maximize #t))]) + [callback (λ (x y) + (let ([frame (send (send menu get-parent) get-frame)]) + (send frame maximize (not (send frame is-maximized?)))))]) (make-object separator-menu-item% menu)) (instantiate menu:can-restore-menu-item% () (label (string-constant bring-frame-to-front...)) diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index 56c8fd42..73f56d0c 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -537,6 +537,7 @@ system-menu set-modified create-status-line + is-maximized? maximize status-line-exists? iconized? diff --git a/collects/mred/private/mrtop.ss b/collects/mred/private/mrtop.ss index 63737b46..f61c67f7 100644 --- a/collects/mred/private/mrtop.ss +++ b/collects/mred/private/mrtop.ss @@ -174,6 +174,7 @@ [(i b) (send wx set-icon i b)] [(i b l?) (send wx set-icon i b l?)])] [maximize (entry-point (lambda (on?) (send wx position-for-initial-show) (send wx maximize on?)))] + [is-maximized? (entry-point (lambda () (send wx is-maximized?)))] [get-menu-bar (entry-point (lambda () (let ([mb (send wx get-the-menu-bar)]) (and mb (wx->mred mb)))))] [modified (entry-point diff --git a/collects/tests/mred/editor.ss b/collects/tests/mred/editor.ss index f2fd36b8..1e235a0d 100644 --- a/collects/tests/mred/editor.ss +++ b/collects/tests/mred/editor.ss @@ -486,6 +486,35 @@ (st es pb find-first-snip) (st #t es is-owned?)) +;; ---------------------------------------- +;; edit-sequences and undo + +(let ([t (new text%)]) + (send t set-max-undo-history 100) + (send t begin-edit-sequence) + (send t begin-edit-sequence) + (send t insert "abcd\n") + (send t set-modified #f) + (send t end-edit-sequence) + (send t delete 0 1) + (send t end-edit-sequence) + (send t undo) + (st "" t get-text)) + +(let ([t (new text%)]) + (send t set-max-undo-history 100) + (send t begin-edit-sequence) + (send t begin-edit-sequence) + (send t insert "abcd\n") + (send t end-edit-sequence) + (send t set-position 0 1) + (send t delete) + (send t set-position 0 1) + (send t delete) + (send t end-edit-sequence) + (send t undo) + (st "" t get-text)) + ;; ---------------------------------------- (report-errs) diff --git a/doc/release-notes/mred/HISTORY b/doc/release-notes/mred/HISTORY index 735d348c..a43cee7b 100644 --- a/doc/release-notes/mred/HISTORY +++ b/doc/release-notes/mred/HISTORY @@ -1,3 +1,8 @@ +Version 369.11 + +Added is-maximized? method to frame% (Windows, Mac OS X) + + Version 369.10 Improved the disabled appearance of some controls under Mac OS X