--- a/UIObjectView.st	Sat Apr 02 16:26:37 2016 +0200
+++ b/UIObjectView.st	Sat Apr 02 17:12:59 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1995 by eXept Software AG
 	      All Rights Reserved
@@ -622,10 +620,10 @@
         "/ use current point - layout of underlaying view might change
         "/ and computation dependent on origin is wrong
         p := self sensor mousePoint.
-        p := self graphicsDevice translatePoint:p fromView:nil toView:self.
+        p := device translatePoint:p fromView:nil toView:self.
     ] ifFalse:[
         p := (anEvent x) @ (anEvent y).
-        p := self graphicsDevice translatePoint:p fromView:evView toView:self.
+        p := device translatePoint:p fromView:evView toView:self.
     ].
 
     "/ patch the event
@@ -933,7 +931,7 @@
         ].
         viewOperatedUpon := selectedView.
 
-        pView := self graphicsDevice translatePoint:aPoint fromView:self toView:selectedView superView.
+        pView := device translatePoint:aPoint fromView:self toView:selectedView superView.
         (selectedView bounds containsPoint:pView) ifFalse:[
             "/ clicked outside the selection
             (self sensor ctrlDown and:[self canChangeLayoutOfView:selectedView]) ifFalse:[
@@ -1472,7 +1470,7 @@
         |innerObject relPoint|
 
         ((aSubView origin extent:aSubView extent) containsPoint:aPoint) ifTrue:[
-            relPoint := self graphicsDevice translatePoint:aPoint fromView:aView toView:aSubView.
+            relPoint := device translatePoint:aPoint fromView:aView toView:aSubView.
             innerObject := self findObjectAt:relPoint in:aSubView.
             innerObject notNil ifTrue:[ ^ innerObject ].
             lastHit := aSubView.