--- a/DebugView.st	Tue Feb 18 18:21:39 2014 +0100
+++ b/DebugView.st	Tue Feb 18 18:28:47 2014 +0100
@@ -1764,7 +1764,7 @@
 "/        ].
 "/    ].
 
-    iAmNew := drawableId isNil.
+    iAmNew := self drawableId isNil.
 
     verboseBacktrace := UserPreferences current verboseBacktraceInDebugger.
 
@@ -1917,7 +1917,7 @@
         contextInspector release.
 
         self unmap.
-        device flush.
+        self flush.
 
         (exitAction == #abort) ifTrue:[ self exit_abort. "does not return" ].
         (exitAction == #abortAll) ifTrue:[ self exit_abortAll. "does not return" ].
@@ -1939,7 +1939,7 @@
 
     "/ restore the previous pointer grab
     grabber notNil ifTrue:[
-        device grabPointerInView:grabber.
+        self graphicsDevice grabPointerInView:grabber.
         grabber := nil.
     ].
 
@@ -2332,13 +2332,13 @@
     continueButton preferredExtent:(w @ continueButton preferredHeight).
 
     aProcess state == #run ifTrue:[
-        device hasColors ifTrue:[
+        self graphicsDevice hasColors ifTrue:[
             continueButton foregroundColor:Color red darkened.
         ].
         continueButton label:(resources string:'Stop').
         continueButton action:[self doStop].
     ] ifFalse:[
-        device hasColors ifTrue:[
+        self graphicsDevice hasColors ifTrue:[
             continueButton foregroundColor:Color green darkened darkened.
         ].
         continueButton label:(resources string:'Continue').
@@ -3356,12 +3356,11 @@
     "/ redefined - since the debugView runs on top of
     "/ the debuggee, there would be no event loop for me.
 
-    drawableId notNil ifTrue:[
+    self drawableId notNil ifTrue:[
         ^ self
     ].
     "physically create the view & subviews"
     self recreate.
-
 !
 
 releaseDebuggee
@@ -4619,7 +4618,7 @@
     ].
 
     inspecting ifTrue:[
-        device hasColors ifTrue:[
+        self graphicsDevice hasColors ifTrue:[
             continueButton foregroundColor:Color red darkened.
         ].
         continueButton label:(resources string:'Stop').
@@ -5151,7 +5150,7 @@
     "stop the process (if its running, otherwise this is a no-op)"
 
     inspecting ifTrue:[
-        device hasColors ifTrue:[
+        self graphicsDevice hasColors ifTrue:[
             continueButton foregroundColor:Color green darkened darkened.
         ].
         continueButton label:(resources string:'Continue').
@@ -6237,7 +6236,7 @@
             "/ consider this a kludge:
             "/ if exclusive, cannot use flash, since it suspends
             "/ (but we cannot suspend here ...)
-            codeView redrawInverted. device flush.
+            codeView redrawInverted. self flush.
             OperatingSystem millisecondDelay:200.
             codeView redraw
         ] ifFalse:[
@@ -6761,7 +6760,7 @@
     "/
     "/ only cache if I am on the Display (i.e. the default screen)
     "/
-    device == Display ifTrue:[
+    self graphicsDevice == Display ifTrue:[
         exclusive ifTrue:[
             CachedExclusive := self
         ] ifFalse:[
@@ -7656,7 +7655,7 @@
 "/                self showError:ex description.
 "/                ex proceed.
 "/            ] do:[
-                device 
+                self graphicsDevice
                     dispatchModalWhile:[
                         Processor activeProcess state:#debug.
                         haveControl].
@@ -7765,7 +7764,7 @@
         ] do:[
             "/ make certain that sub-debuggers, inspectors etc.
             "/ come up on my device.
-            Screen currentScreenQuerySignal answer:device
+            Screen currentScreenQuerySignal answer:self graphicsDevice
             do:[
                 Dialog aboutToOpenBoxNotificationSignal
                     handle:[:ex | ex proceed ]
@@ -9066,15 +9065,15 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.645 2014-02-13 18:32:47 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.646 2014-02-18 17:28:47 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.645 2014-02-13 18:32:47 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.646 2014-02-18 17:28:47 stefan Exp $'
 !
 
 version_SVN
-    ^ '$Id: DebugView.st,v 1.645 2014-02-13 18:32:47 stefan Exp $'
+    ^ '$Id: DebugView.st,v 1.646 2014-02-18 17:28:47 stefan Exp $'
 ! !