From 652b73ad26f07a5370de536c8ccb3e11f7ca5369 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 9 Apr 1999 16:15:31 +0000 Subject: [PATCH] .. original commit: 3d81056bb44c17f3c5afedea3745dd2f7078d893 --- collects/framework/frame.ss | 10 +++++++++- collects/framework/frameworks.ss | 3 +++ collects/framework/handler.ss | 4 +++- collects/framework/keymap.ss | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss index 32d1357e..11518e6d 100644 --- a/collects/framework/frame.ss +++ b/collects/framework/frame.ss @@ -1060,6 +1060,14 @@ (editor-position-changed) (send position-edit lock #t)))) + (define pasteboard-info<%> (interface (info<%>))) + (define pasteboard-info-mixin + (mixin (info<%>) (pasteboard-info<%>) args + (override + [get-editor% (lambda () pasteboard:info%)]) + (sequence + (apply super-init args)))) + (define file<%> (interface (-editor<%>))) (define file-mixin (mixin (-editor<%>) (file<%>) args @@ -1095,7 +1103,7 @@ (define text-info-file% (file-mixin text-info%)) (define -pasteboard% (pasteboard-mixin editor%)) - (define pasteboard-info% (info-mixin -pasteboard%)) + (define pasteboard-info% (pasteboard-info-mixin (info-mixin -pasteboard%))) (define pasteboard-info-file% (file-mixin pasteboard-info%)) ) diff --git a/collects/framework/frameworks.ss b/collects/framework/frameworks.ss index 90f76ae6..2626b590 100644 --- a/collects/framework/frameworks.ss +++ b/collects/framework/frameworks.ss @@ -169,6 +169,9 @@ text-info<%> text-info-mixin + pasteboard-info<%> + pasteboard-info-mixin + file<%> file-mixin diff --git a/collects/framework/handler.ss b/collects/framework/handler.ss index 563a748a..582b8e33 100644 --- a/collects/framework/handler.ss +++ b/collects/framework/handler.ss @@ -87,7 +87,9 @@ (opt-lambda (filename [make-default (lambda () - (send (make-object frame:text-info-file% filename) show #t))]) + (let ([frame (make-object frame:text-info-file% filename)]) + (send frame show #t) + frame))]) (gui-utils:show-busy-cursor (lambda () (if filename diff --git a/collects/framework/keymap.ss b/collects/framework/keymap.ss index 38a4b921..9884311a 100644 --- a/collects/framework/keymap.ss +++ b/collects/framework/keymap.ss @@ -300,7 +300,8 @@ [region-click (lambda (edit event f) - (when (send event button-down?) + (when (and (send event button-down?) + (is-a? edit original:text%)) (let ([x-box (box (send event get-x))] [y-box (box (send event get-y))] [eol-box (box #f)])