--- a/DeviceWorkstation.st	Thu Mar 20 10:53:38 2014 +0100
+++ b/DeviceWorkstation.st	Thu Mar 20 17:57:37 2014 +0100
@@ -1574,21 +1574,21 @@
     w1 := window1 ? self rootView.
     w2 := window2 ? self rootView.
 
-    (w1 device == self and:[w2 device == self]) ifFalse:[
-	self error:'Huh - Cross device translation' mayProceed:true.
-	^ aPoint
+    (w1 device ~~ self or:[w2 device ~~ self]) ifTrue:[
+        self error:'Huh - Cross device translation' mayProceed:true.
+        ^ aPoint
     ].
     w1 isView ifTrue:[
-	offset1 := 0
+        offset1 := 0
     ] ifFalse:[
-	offset1 := w1 origin.
-	w1 := w1 container.
+        offset1 := w1 origin.
+        w1 := w1 container.
     ].
     w2 isView ifTrue:[
-	offset2 := 0
+        offset2 := 0
     ] ifFalse:[
-	offset2 := w2 origin.
-	w2 := w2 container.
+        offset2 := w2 origin.
+        w2 := w2 container.
     ].
     devicePoint := self translatePoint:aPoint from:(w1 id) to:(w2 id).
     devicePoint isNil ifTrue:[ ^ aPoint].
@@ -8320,11 +8320,11 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.608 2014-03-19 22:05:16 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.609 2014-03-20 16:57:37 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.608 2014-03-19 22:05:16 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.609 2014-03-20 16:57:37 stefan Exp $'
 ! !