--- a/DObject.st Fri Oct 28 04:19:24 1994 +0100
+++ b/DObject.st Thu Nov 17 15:24:56 1994 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -19,9 +19,9 @@
DisplayObject comment:'
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
-$Header: /cvs/stx/stx/libview2/Attic/DObject.st,v 1.8 1994-08-05 01:13:50 claus Exp $
+$Header: /cvs/stx/stx/libview2/Attic/DObject.st,v 1.9 1994-11-17 14:24:56 claus Exp $
'!
!DisplayObject class methodsFor:'documentation'!
@@ -29,7 +29,7 @@
copyright
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libview2/Attic/DObject.st,v 1.8 1994-08-05 01:13:50 claus Exp $
+$Header: /cvs/stx/stx/libview2/Attic/DObject.st,v 1.9 1994-11-17 14:24:56 claus Exp $
"
!
@@ -76,7 +76,9 @@
!
computeBoundingBox
- self subclassResponsibility
+ "compute my boundingBox into the local 'frame'"
+
+ ^ self subclassResponsibility
! !
!DisplayObject methodsFor:'queries'!
@@ -124,7 +126,7 @@
"object must return a frame boundary rectangle"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame
!
@@ -133,7 +135,7 @@
"return the width of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame width
!
@@ -142,7 +144,7 @@
"return the height of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame height
!
@@ -151,7 +153,7 @@
"return the extent of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame extent
!
@@ -160,7 +162,7 @@
"return the frame origin"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame origin
!
@@ -169,7 +171,7 @@
"return the frame corner"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame corner
!
@@ -209,7 +211,7 @@
|org left right top bott px py d2|
(delta == 0) ifTrue:[
- ^ frame containsPoint:aPoint
+ ^ frame containsPoint:aPoint
].
"
@@ -247,26 +249,26 @@
displayOn: aDisplayMedium
self displayOn:aDisplayMedium
- at:0@0
+ at:0@0
clippingBox:nil
- rule:#copy
- mask:nil
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint
self displayOn:aDisplayMedium
- at:aPoint
+ at:aPoint
clippingBox:nil
- rule:#copy
- mask:nil
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint clippingBox:clipRectangle
^ self displayOn:aDisplayMedium
- at:aPoint
- clippingBox:clipRectangle
- rule:#copy
- mask:nil
+ at:aPoint
+ clippingBox:clipRectangle
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint clippingBox:clip rule:rule mask: aForm
@@ -274,7 +276,7 @@
aDisplayMedium function:rule.
^ self drawIn:aDisplayMedium
- at:(aPoint + self origin)
+ at:(aPoint + self origin)
! !
!DisplayObject methodsFor:'drawing'!
@@ -316,7 +318,7 @@
|org|
org := self origin + anOffset - aView viewOrigin.
aView displayRectangleX:(org x) y:(org y)
- width:(frame width) height:(frame height)
+ width:(frame width) height:(frame height)
!
drawOutlineIn:aView
@@ -335,24 +337,24 @@
"draw the receiver for dragging"
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:(drawOrigin - (self origin))
+ self drawOutlineIn:aView offset:(drawOrigin - (self origin))
] ifFalse: [
- self drawIn:aView offset:(drawOrigin - (self origin))
+ self drawIn:aView offset:(drawOrigin - (self origin))
]
!
drawDragIn:aView offset:drawOrigin
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:drawOrigin
+ self drawOutlineIn:aView offset:drawOrigin
] ifFalse: [
- self drawIn:aView offset:drawOrigin
+ self drawIn:aView offset:drawOrigin
]
!
drawDragIn:aView
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:(0 @ 0)
+ self drawOutlineIn:aView offset:(0 @ 0)
] ifFalse: [
- self drawIn:aView offset:(0 @ 0)
+ self drawIn:aView offset:(0 @ 0)
]
! !
--- a/DisplayObject.st Fri Oct 28 04:19:24 1994 +0100
+++ b/DisplayObject.st Thu Nov 17 15:24:56 1994 +0100
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -19,9 +19,9 @@
DisplayObject comment:'
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
-$Header: /cvs/stx/stx/libview2/DisplayObject.st,v 1.8 1994-08-05 01:13:50 claus Exp $
+$Header: /cvs/stx/stx/libview2/DisplayObject.st,v 1.9 1994-11-17 14:24:56 claus Exp $
'!
!DisplayObject class methodsFor:'documentation'!
@@ -29,7 +29,7 @@
copyright
"
COPYRIGHT (c) 1989 by Claus Gittinger
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -42,7 +42,7 @@
version
"
-$Header: /cvs/stx/stx/libview2/DisplayObject.st,v 1.8 1994-08-05 01:13:50 claus Exp $
+$Header: /cvs/stx/stx/libview2/DisplayObject.st,v 1.9 1994-11-17 14:24:56 claus Exp $
"
!
@@ -76,7 +76,9 @@
!
computeBoundingBox
- self subclassResponsibility
+ "compute my boundingBox into the local 'frame'"
+
+ ^ self subclassResponsibility
! !
!DisplayObject methodsFor:'queries'!
@@ -124,7 +126,7 @@
"object must return a frame boundary rectangle"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame
!
@@ -133,7 +135,7 @@
"return the width of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame width
!
@@ -142,7 +144,7 @@
"return the height of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame height
!
@@ -151,7 +153,7 @@
"return the extent of the frame"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame extent
!
@@ -160,7 +162,7 @@
"return the frame origin"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame origin
!
@@ -169,7 +171,7 @@
"return the frame corner"
frame isNil ifTrue:[
- frame := self computeBoundingBox
+ frame := self computeBoundingBox
].
^ frame corner
!
@@ -209,7 +211,7 @@
|org left right top bott px py d2|
(delta == 0) ifTrue:[
- ^ frame containsPoint:aPoint
+ ^ frame containsPoint:aPoint
].
"
@@ -247,26 +249,26 @@
displayOn: aDisplayMedium
self displayOn:aDisplayMedium
- at:0@0
+ at:0@0
clippingBox:nil
- rule:#copy
- mask:nil
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint
self displayOn:aDisplayMedium
- at:aPoint
+ at:aPoint
clippingBox:nil
- rule:#copy
- mask:nil
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint clippingBox:clipRectangle
^ self displayOn:aDisplayMedium
- at:aPoint
- clippingBox:clipRectangle
- rule:#copy
- mask:nil
+ at:aPoint
+ clippingBox:clipRectangle
+ rule:#copy
+ mask:nil
!
displayOn:aDisplayMedium at:aPoint clippingBox:clip rule:rule mask: aForm
@@ -274,7 +276,7 @@
aDisplayMedium function:rule.
^ self drawIn:aDisplayMedium
- at:(aPoint + self origin)
+ at:(aPoint + self origin)
! !
!DisplayObject methodsFor:'drawing'!
@@ -316,7 +318,7 @@
|org|
org := self origin + anOffset - aView viewOrigin.
aView displayRectangleX:(org x) y:(org y)
- width:(frame width) height:(frame height)
+ width:(frame width) height:(frame height)
!
drawOutlineIn:aView
@@ -335,24 +337,24 @@
"draw the receiver for dragging"
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:(drawOrigin - (self origin))
+ self drawOutlineIn:aView offset:(drawOrigin - (self origin))
] ifFalse: [
- self drawIn:aView offset:(drawOrigin - (self origin))
+ self drawIn:aView offset:(drawOrigin - (self origin))
]
!
drawDragIn:aView offset:drawOrigin
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:drawOrigin
+ self drawOutlineIn:aView offset:drawOrigin
] ifFalse: [
- self drawIn:aView offset:drawOrigin
+ self drawIn:aView offset:drawOrigin
]
!
drawDragIn:aView
self class dragOutline ifTrue:[
- self drawOutlineIn:aView offset:(0 @ 0)
+ self drawOutlineIn:aView offset:(0 @ 0)
] ifFalse: [
- self drawIn:aView offset:(0 @ 0)
+ self drawIn:aView offset:(0 @ 0)
]
! !