--- a/PopUpView.st	Sat Apr 02 16:34:02 2016 +0200
+++ b/PopUpView.st	Sat Apr 02 17:06:48 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 TopView subclass:#PopUpView
 	instanceVariableNames:'shadowView haveControl exclusivePointer mapTime
 		previousPointerGrab previousKeyboardGrab'
@@ -174,7 +176,7 @@
 showAtPointer
     "realize the view at the current pointer position"
 
-    self showAt:(self graphicsDevice pointerPosition) resizing:true
+    self showAt:(device pointerPosition) resizing:true
 !
 
 showCenteredIn:aView
@@ -206,13 +208,13 @@
 !PopUpView methodsFor:'grabbing'!
 
 grabKeyboard
-    previousKeyboardGrab := self graphicsDevice activeKeyboardGrab.
+    previousKeyboardGrab := device activeKeyboardGrab.
 "/ Transcript show:'k-ggg by '; show:self; show:'[',self identityHash printString,']'; showCR:' - previous is ' , previousKeyboardGrab printString.
     ^ super grabKeyboard
 !
 
 grabPointerWithCursor:aCursorOrNil
-    previousPointerGrab := self graphicsDevice activePointerGrab.
+    previousPointerGrab := device activePointerGrab.
 "/ Transcript show:'ggg by '; show:self; show:'[',self identityHash printString,']'; showCR:' - previous is ' , previousPointerGrab printString.
     ^ super grabPointerWithCursor:aCursorOrNil
 !
@@ -221,7 +223,7 @@
 "/ Transcript show:'k-uuu by '; show:self; show:'[',self identityHash printString,']'; showCR:' - previous is ' , previousKeyboardGrab printString.
     super ungrabKeyboard.
     previousKeyboardGrab notNil ifTrue:[
-        self graphicsDevice grabKeyboardInView:previousKeyboardGrab
+        device grabKeyboardInView:previousKeyboardGrab
     ].
 !
 
@@ -229,7 +231,7 @@
 "/ Transcript show:'uuu by '; show:self; show:'[',self identityHash printString,']'; showCR:' - previous is ' , previousPointerGrab printString.
     super ungrabPointer.
     previousPointerGrab notNil ifTrue:[
-        self graphicsDevice grabPointerInView:previousPointerGrab
+        device grabPointerInView:previousPointerGrab
     ].
 ! !
 
@@ -257,7 +259,7 @@
     super initStyle.
 
     DefaultBorderColor notNil ifTrue:[
-        self borderColor:(DefaultBorderColor onDevice:self graphicsDevice).
+        self borderColor:(DefaultBorderColor onDevice:device).
     ].
     (bw := DefaultBorderWidth) isNil ifTrue:[
         bw := (styleSheet is3D ifTrue:[0] ifFalse:[1]).
@@ -271,8 +273,8 @@
     ].
     self level:l.
 
-    (self class shadowsOnDevice:self graphicsDevice) ifTrue:[
-        shadowView := (ShadowView onDevice:self graphicsDevice) for:self.
+    (self class shadowsOnDevice:device) ifTrue:[
+        shadowView := (ShadowView onDevice:device) for:self.
     ].
 
     "Modified: / 4.12.1998 / 15:11:28 / cg"
@@ -293,8 +295,8 @@
 releasePointer 
     "release the mouse pointer"
 
-    self graphicsDevice activePointerGrab == self ifTrue:[
-        self graphicsDevice ungrabPointer.
+    device activePointerGrab == self ifTrue:[
+        device ungrabPointer.
     ].
 
     "Modified: 12.5.1996 / 22:04:09 / cg"
@@ -438,10 +440,10 @@
 !PopUpView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.62 2014-02-18 15:05:32 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.62 2014-02-18 15:05:32 stefan Exp $'
+    ^ '$Header$'
 ! !