--- a/ExtendedComboBox.st	Sat Apr 02 17:08:02 2016 +0200
+++ b/ExtendedComboBox.st	Sat Apr 02 17:08:55 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1998 by eXept Software AG
               All Rights Reserved
@@ -664,7 +662,7 @@
     "creates a SelectionInListView as menuWidget - menu setting the list"
 
     menuWidget isNil ifTrue:[
-        menuWidget := SelectionInListView onDevice:(self graphicsDevice ? Screen current).
+        menuWidget := SelectionInListView onDevice:(device ? Screen current).
 
         menuWidget doubleClickAction:[:anIndex| 
             self contents:(menuWidget at:anIndex)
@@ -929,7 +927,7 @@
         (evView isSameOrComponentOf:menuField) ifFalse:[
             ^ false
         ].
-        point := self graphicsDevice translatePoint:point fromView:evView toView:menuField.
+        point := device translatePoint:point fromView:evView toView:menuField.
     ].
     x := point x.
     (x between:0 and:menuField width) ifFalse:[^ false].
@@ -1111,7 +1109,7 @@
     menuWrapper notNil ifTrue:[
         menuWrapper realized ifFalse:[
             (id := menuWrapper id) notNil ifTrue:[
-                self graphicsDevice unmapWindow:id
+                device unmapWindow:id
             ]
         ] ifTrue:[
            menuWrapper unmap
@@ -1132,12 +1130,12 @@
     ].
     menuWrapper isNil ifTrue:[
         menuWidget isNil ifTrue:[^ self].
-        menuWrapper := MenuWrapper onDevice:(self graphicsDevice ? Screen current).
+        menuWrapper := MenuWrapper onDevice:(device ? Screen current).
         menuWrapper for:menuWidget in:self.
     ].
     menuButton turnOn.
 
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
     menuOrigin   := graphicsDevice translatePoint:(0@height) fromView:self toView:nil.
     "/ notice, the position-dependent query: if there is a higher secondary screen,
     "/ this makes a difference in where a popUpMenu is allowed...
@@ -1276,7 +1274,7 @@
             "/ if I took the grab from someone else, this buttonEvent should
             "/ also go to that one ...but not, if it falls into my own ext-comboBox (sigh)
             "/ (example: a sub-ext-box in an ext-box, clicking on the outer boxes menuButton)
-            graphicsDevice := self graphicsDevice.
+            graphicsDevice := device.
             (oldGrabber := graphicsDevice activePointerGrab) notNil ifTrue:[
                 p := graphicsDevice translatePoint:(x@y) fromView:self toView:comboBox.
                 ((0@0 extent:comboBox extent) containsPoint:p) ifFalse:[        
@@ -1318,7 +1316,7 @@
 
     implicitGrabView notNil ifTrue:[
         ev isButtonEvent ifTrue:[
-            p := self graphicsDevice translatePoint:(x@y) fromView:self toView:implicitGrabView.
+            p := device translatePoint:(x@y) fromView:self toView:implicitGrabView.
             ev view:implicitGrabView.
             ev x:p x.
             ev y:p y.
@@ -1343,7 +1341,7 @@
         ^ super dispatchEvent:ev withFocusOn:focusView delegate:false
     ].
 
-    p := self graphicsDevice translatePoint:(x@y) fromView:self toView:view.
+    p := device translatePoint:(x@y) fromView:self toView:view.
 
     ev isButtonPressEvent ifTrue:[
         (view wantsFocusWithButtonPress) ifTrue:[
@@ -1494,7 +1492,7 @@
 
     resizeCursor isNil ifTrue:[
         restoreCursor := self cursor.
-        resizeCursor  := Cursor fourWay onDevice:self graphicsDevice.
+        resizeCursor  := Cursor fourWay onDevice:device.
     ].
     super mapped.
     self assignInitialKeyboardFocus.
@@ -1510,7 +1508,7 @@
         evView := ev view.
         
         evView ~~ self ifTrue:[ |p|
-            p := self graphicsDevice translatePoint:(x@y) fromView:evView toView:self.
+            p := device translatePoint:(x@y) fromView:evView toView:self.
             x := p x.
             y := p y.
         ].