--- a/PopUpMenu.st	Tue Feb 18 16:03:42 2014 +0100
+++ b/PopUpMenu.st	Tue Feb 18 16:04:30 2014 +0100
@@ -955,7 +955,7 @@
     ].
 
     aPoint isNil ifTrue:[
-        self showAt:(device pointerPosition) resizing:true
+        self showAt:(self graphicsDevice pointerPosition) resizing:true
     ] ifFalse:[
         self showAt:aPoint.
     ].
@@ -1384,7 +1384,7 @@
         and:[y < (height-margin)]]]) ifTrue:[
             "/ inside my menuView
             hideOnRelease := true.
-            p := device 
+            p := self graphicsDevice 
                     translatePoint:(x @ y)
                     fromView:self
                     toView:menuView.
@@ -1396,7 +1396,7 @@
 
     "outside of myself"
     (self isOpenedAsSubmenu) ifTrue:[
-        p := device 
+        p := self graphicsDevice 
                 translatePoint:(x @ y)
                 fromView:self
                 toView:(menuView superMenu).
@@ -1590,7 +1590,7 @@
 
 regainControl
 |g|
-    ((g := device activePointerGrab) ~~ self) ifTrue:[
+    ((g := self graphicsDevice activePointerGrab) ~~ self) ifTrue:[
         self forceUngrabPointer.
         self forceUngrabKeyboard.
         shown ifTrue:[
@@ -1686,10 +1686,10 @@
 !PopUpMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.114 2013-08-28 14:50:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.115 2014-02-18 15:04:30 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.114 2013-08-28 14:50:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.115 2014-02-18 15:04:30 stefan Exp $'
 ! !