--- a/EventMonitor.st	Sat Apr 02 17:15:08 2016 +0200
+++ b/EventMonitor.st	Sat Apr 02 17:16:04 2016 +0200
@@ -11,19 +11,21 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationModel subclass:#EventMonitor
-        instanceVariableNames:'outputSelector'
-        classVariableNames:''
-        poolDictionaries:''
-        category:'Monitors-ST/X'
+	instanceVariableNames:'outputSelector'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Monitors-ST/X'
 !
 
 View subclass:#EventMonitorView
-        instanceVariableNames:'outputStream labelHolder showButtonMotion showFocusEvents
-                showTimestamp'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:EventMonitor
+	instanceVariableNames:'outputStream labelHolder showButtonMotion showFocusEvents
+		showTimestamp'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:EventMonitor
 !
 
 !EventMonitor class methodsFor:'documentation'!
@@ -578,7 +580,7 @@
              , ' (' , key asciiValue printString , ')'.
     ] ifFalse:[
         s := ' symbolic key:' , key storeString.
-        untranslatedKey := self graphicsDevice keyboardMap keyAtValue:key ifAbsent:key.
+        untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
         untranslatedKey ~~ key ifTrue:[
             s := s , ' untranslated key:' , untranslatedKey storeString
         ].
@@ -619,7 +621,7 @@
         ' (' printOn:outputStream. key asciiValue printOn:outputStream. ')' printOn:outputStream
     ] ifFalse:[
         ' symbolic key:' print. key storeString printOn:outputStream.
-        untranslatedKey := self graphicsDevice keyboardMap keyAtValue:key ifAbsent:key.
+        untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
         untranslatedKey ~~ key ifTrue:[
             ' untranslated key:' printOn:outputStream. untranslatedKey storeString printOn:outputStream
         ]
@@ -723,6 +725,6 @@
 !EventMonitor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/EventMonitor.st,v 1.32 2014-03-20 12:53:40 stefan Exp $'
+    ^ '$Header$'
 ! !