diff --git a/notes/mred/MrEd_100.txt b/notes/mred/MrEd_100.txt index 8601e36a..7bdde5dc 100644 --- a/notes/mred/MrEd_100.txt +++ b/notes/mred/MrEd_100.txt @@ -238,7 +238,7 @@ event% area<%> get-parent - get-top-level - returns the area's frame/dialog + get-top-level-window - returns the area's frame/dialog min-width min-height stretchable-width stretchable-height @@ -250,10 +250,12 @@ window<%> : area<%> enable is-enabled? on-size on-subwindow-char on-subwindow-event - formerly pre-on-... - client->screen screen->client + client->screen screen->client - takes two and returns two values get-label set-label get-plain-label - e.g., "Button" instead of "&Button" - get-client-size get-geometry get-width get-height get-x get-y + get-client-size - returns two values + get-size - returns two values + get-width get-height get-x get-y get-cursor set-cursor show is-shown? refresh @@ -308,7 +310,7 @@ frame% : top-level-window<%> <= label [parent #f] [width #f] [height #f] [x #f] [y #f] [style null] styles: 'no-thick-border 'no-resize-border 'no-caption 'no-system-menu 'iconize 'maximize 'mdi-parent 'mdi-child - create-status-line set-status-line has-status-line? + create-status-line set-status-text has-status-line? get-menu-bar iconize is-iconized? set-icon maximize @@ -549,7 +551,9 @@ bell label->plain-label get-resource write-resource yield flush-display -get-face-list +get-face-list - formerly wx:get-font-list + +find-graphical-system-path - formerly wx:find-path current-ps-setup diff --git a/src/mred/wrap/mred.ss b/src/mred/wrap/mred.ss index 20cdb1b5..d9cff61f 100644 --- a/src/mred/wrap/mred.ss +++ b/src/mred/wrap/mred.ss @@ -1815,7 +1815,7 @@ (define area<%> (interface () - get-parent get-top-level + get-parent get-top-level-window min-width min-height stretchable-width stretchable-height)) @@ -1823,7 +1823,7 @@ (class* mred% (area<%>) (mk-wx get-wx-panel parent) (public [get-parent (lambda () parent)] - [get-top-level (lambda () (wx->mred (send wx get-top-level)))] + [get-top-level-window (lambda () (wx->mred (send wx get-top-level)))] [min-width (param get-wx-panel 'min-width)] [min-height (param get-wx-panel 'min-height)] [stretchable-width (param get-wx-panel 'stretchable-in-x)] @@ -1880,7 +1880,7 @@ client->screen screen->client enable is-enabled? get-label set-label - get-client-size get-geometry get-width get-height get-x get-y + get-client-size get-size get-width get-height get-x get-y get-cursor set-cursor show is-shown? refresh)) @@ -1919,12 +1919,10 @@ (double-boxed 0 0 (lambda (x y) (send wx get-client-size x y))))] - [get-geometry (lambda () - (let ([x (box 0)][y (box 0)][w (box 0)][h (box 0)]) - (send wx get-size w h x y) - (values (- (unbox x) (if top? 0 (send wx dx))) - (- (unbox y) (if top? 0 (send wx dy))) - (unbox w) (unbox h))))] + [get-size (lambda () + (double-boxed + 0 0 + (lambda (x y) (send wx get-size x y))))] [get-width (lambda () (send wx get-width))] [get-height (lambda () (send wx get-height))] @@ -2056,7 +2054,7 @@ [on-subwindow-char (lambda (w event) (send wx handle-menu-key event))]) (public [create-status-line (lambda () (unless status-line? (send wx create-status-line) (set! status-line? #t)))] - [set-status-line (lambda (s) (send wx set-status-text s))] + [set-status-text (lambda (s) (send wx set-status-text s))] [has-status-line? (lambda () status-line?)] [iconize (lambda (on?) (send wx iconize on?))] [is-iconized? (lambda () (send wx iconized?))]