--- a/TopView.st	Tue Feb 18 17:49:08 2014 +0100
+++ b/TopView.st	Tue Feb 18 18:12:37 2014 +0100
@@ -637,11 +637,11 @@
     |delta|
 
     CurrentWindowBeingMoved == self ifTrue:[
-        delta := device pointerPosition - CurrentWindowMoveStart.
+        delta := self graphicsDevice pointerPosition - CurrentWindowMoveStart.
         (CurrentWindowMoveState notNil
         or:[ delta r > 5 ]) ifTrue:[
             CurrentWindowMoveState := #inMove.
-            CurrentWindowMoveStart := device pointerPosition.
+            CurrentWindowMoveStart := self graphicsDevice pointerPosition.
             self origin:(self origin + delta).
         ].
     ].
@@ -665,7 +665,7 @@
       which want to be moved by click-motion on the background)"
 
     CurrentWindowBeingMoved := self.
-    CurrentWindowMoveStart := device pointerPosition.
+    CurrentWindowMoveStart := self graphicsDevice pointerPosition.
     CurrentWindowMoveState := nil.
 
     "Created: / 03-03-2011 / 19:09:39 / cg"
@@ -752,7 +752,7 @@
     |wg dev|
 
     wg := windowGroup.                  "/ have to fetch windowGroup before;
-    dev := device.                      "/ and device ...
+    dev := self graphicsDevice.         "/ and device ...
     super destroy.                      "/ ... since destroy nils em
 
 "/    dev notNil ifTrue:[
@@ -767,24 +767,16 @@
     "Modified: 20.3.1997 / 22:14:16 / cg"
 !
 
-release
-    keyboardProcessor notNil ifTrue:[
-	keyboardProcessor release.
-	keyboardProcessor := nil.
-    ].
-    super release
-!
-
 initialize
     "initialize the topViews position for the screens center"
 
     |screenCenter|
 
     super initialize.
-    device initializeTopViewHookFor:self.
+    self graphicsDevice initializeTopViewHookFor:self.
 
     "/ MULTI SCREEN
-    screenCenter := device centerOfMonitorHavingPointer rounded.
+    screenCenter := self graphicsDevice centerOfMonitorHavingPointer rounded.
 
     left := screenCenter x - (width // 2).
     top := screenCenter y - (height // 2).
@@ -797,10 +789,10 @@
     super postRealize.
 
     keyboardProcessor isNil ifTrue:[
-	keyboardProcessor := KeyboardProcessor new.
+        keyboardProcessor := KeyboardProcessor new.
     ].
 
-    device realizedTopViewHookFor:self
+    self graphicsDevice realizedTopViewHookFor:self
 !
 
 realize
@@ -811,6 +803,14 @@
 	self unmarkAsUnmappedModalBox.
     ].
     super realize.
+!
+
+release
+    keyboardProcessor notNil ifTrue:[
+	keyboardProcessor release.
+	keyboardProcessor := nil.
+    ].
+    super release
 ! !
 
 !TopView methodsFor:'misc'!
@@ -837,8 +837,8 @@
      and (especially) to wait until an application session is finished
      when invoking commands with the rDoit mechanism"
 
-    [drawableId isNil] whileFalse:[
-	Delay waitForSeconds:0.1.
+    [self drawableId isNil] whileFalse:[
+        Delay waitForSeconds:0.1.
     ].
 
     "asynchronous:
@@ -1093,8 +1093,8 @@
      Can anyone tell me what the difference between raise, activate and setForeground
      really is (I mean really - not what is written in the crappy documentation)"
 
-    drawableId isNil ifTrue:[self create].
-    device activateWindow:drawableId
+    self drawableId isNil ifTrue:[self create].
+    self graphicsDevice activateWindow:self drawableId
 
     "
      Transcript topView activate
@@ -1165,14 +1165,14 @@
      In contrast to map, which does it non-iconified"
 
     realized ifFalse:[
-	"
-	 now, make the view visible
-	"
-	realized := true.
-	device
-	    mapView:self id:drawableId iconified:true
-	    atX:left y:top width:width height:height
-	    minExtent:(self minExtent) maxExtent:(self maxExtent)
+        "
+         now, make the view visible
+        "
+        realized := true.
+        self graphicsDevice
+            mapView:self id:self drawableId iconified:true
+            atX:left y:top width:width height:height
+            minExtent:(self minExtent) maxExtent:(self maxExtent)
     ]
 
     "Modified: 25.2.1997 / 22:44:33 / cg"
@@ -1199,8 +1199,8 @@
 
      Mark a TopView as #beScreenDialog, to send this on open."
 
-    drawableId isNil ifTrue:[self create].
-    device setForegroundWindow:drawableId
+    self drawableId isNil ifTrue:[self create].
+    self graphicsDevice setForegroundWindow:self drawableId
 
     "
      Transcript topView raise
@@ -1227,14 +1227,14 @@
 
     self obsoleteMethodWarning.
 
-    drawableId isNil ifTrue:[self create].
+    self drawableId isNil ifTrue:[self create].
     anotherView isNil ifTrue:[
-        otherId := drawableId.
+        otherId := self drawableId.
     ] ifFalse:[
         anotherView create.
         otherId := anotherView id.
     ].
-    device setTransient:drawableId for:otherId.
+    self graphicsDevice setTransient:self drawableId for:otherId.
     self origin:aPosition.
     self open
 
@@ -1380,7 +1380,7 @@
             self getKeyboardFocus.
         ]
     ].
-    device platformName = #WIN32 ifTrue:[
+    self graphicsDevice platformName = #WIN32 ifTrue:[
         self raise
     ].
     false "self isScreenDialog" ifTrue:[
@@ -1443,11 +1443,11 @@
 !TopView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.147 2013-09-12 08:51:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.148 2014-02-18 17:12:37 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.147 2013-09-12 08:51:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.148 2014-02-18 17:12:37 stefan Exp $'
 ! !