--- a/ObjectView.st	Fri Sep 29 09:44:30 2000 +0200
+++ b/ObjectView.st	Fri Sep 29 14:21:29 2000 +0200
@@ -291,7 +291,7 @@
 handleSize
     "size of blob drawn for handles"
 
-    ^ (Display horizontalPixelPerMillimeter * 1.2) rounded asInteger
+    ^ (Screen current horizontalPixelPerMillimeter * 1.2) rounded asInteger
 !
 
 hitDelta
@@ -582,8 +582,8 @@
     |sel|
 
     sel := self getSelection.
-    ((device platformName = 'WIN32')
-    or:[(device getSelectionOwnerOf:(device atomIDOf:'PRIMARY')) == drawableId])
+    ((Display platformName ~= 'X11')
+     or:[(device getSelectionOwnerOf:#PRIMARY) == drawableId])
     ifTrue:[
         "
          a local selection - paste with some offset
@@ -2179,7 +2179,7 @@
     |startIndex|
 
     startIndex := contents identityIndexOf:objectToBeTested
-				  ifAbsent:[self error].
+                                  ifAbsent:[self error:'nonexisting object'].
     contents from:startIndex to:(contents size) do:aBlock
 !
 
@@ -2200,7 +2200,7 @@
 
     |endIndex|
 
-    endIndex := contents identityIndexOf:objectToBeTested ifAbsent:[self error].
+    endIndex := contents identityIndexOf:objectToBeTested ifAbsent:[self error:'nonexisting object'].
     contents from:1 to:(endIndex - 1) do:aBlock
 !
 
@@ -2638,7 +2638,7 @@
 !
 
 handleSize
-    "return the size of the handles - sincc handles should be
+    "return the size of the handles - since handles should be
      the same size regardless of scaling, inverse-scale from
      what the default is."
 
@@ -2646,7 +2646,7 @@
 
     hs := self class handleSize.
     transformation notNil ifTrue:[
-	^ transformation applyInverseScaleX:hs
+        ^ transformation applyInverseScaleX:hs
     ].
     ^ hs
 !
@@ -3025,8 +3025,8 @@
      objectsFrame startIndex|
 
     (objectToBeTested == (contents last)) ifTrue:[
-	"quick return if object is on top"
-	^ false
+        "quick return if object is on top"
+        ^ false
     ].
 
     frameToBeTested := self frameOf:objectToBeTested.
@@ -3037,18 +3037,18 @@
 
     "check objects after the one to check"
 
-    startIndex := contents identityIndexOf:objectToBeTested ifAbsent:[self error].
+    startIndex := contents identityIndexOf:objectToBeTested ifAbsent:[self error:'nonexisting object'].
     contents from:(startIndex + 1) to:(contents size) do:[:object |
-	objectsFrame := self frameOf:object.
-	(objectsFrame right < frameleft) ifFalse:[
-	    (objectsFrame left > frameright) ifFalse:[
-		(objectsFrame bottom < frametop) ifFalse:[
-		    (objectsFrame top > framebot) ifFalse:[
-			^ true
-		    ]
-		]
-	    ]
-	]
+        objectsFrame := self frameOf:object.
+        (objectsFrame right < frameleft) ifFalse:[
+            (objectsFrame left > frameright) ifFalse:[
+                (objectsFrame bottom < frametop) ifFalse:[
+                    (objectsFrame top > framebot) ifFalse:[
+                        ^ true
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ false
 ! !
@@ -3229,5 +3229,5 @@
 !ObjectView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.84 2000-08-21 22:45:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.85 2000-09-29 12:21:29 stefan Exp $'
 ! !