--- a/Tools__CodeView2.st	Tue Feb 18 18:00:43 2014 +0100
+++ b/Tools__CodeView2.st	Tue Feb 18 18:04:48 2014 +0100
@@ -28,36 +28,36 @@
 "{ NameSpace: Tools }"
 
 SimpleView subclass:#CodeView2
-	instanceVariableNames:'gutterView textView textViewScroller methodHolder languageHolder
-		classHolder browserHolder codeAspect modifiedChannel
-		showGutterChannel showAcceptCancelBarChannel modeHolder
-		serviceManager services servicesFromClient syntaxElements
-		currentParseNodeHolder currentBlockNodeHolder
-		syntaxElementSelection highlightEmphasis diffMode
-		synchronizedCodeViews'
-	classVariableNames:'TraceSelectors'
-	poolDictionaries:''
-	category:'Interface-CodeView'
+        instanceVariableNames:'gutterView textView textViewScroller methodHolder languageHolder
+                classHolder browserHolder codeAspect modifiedChannel
+                showGutterChannel showAcceptCancelBarChannel modeHolder
+                serviceManager services servicesFromClient syntaxElements
+                currentParseNodeHolder currentBlockNodeHolder
+                syntaxElementSelection highlightEmphasis diffMode
+                synchronizedCodeViews'
+        classVariableNames:'TraceSelectors'
+        poolDictionaries:''
+        category:'Interface-CodeView'
 !
 
 SimpleView subclass:#GutterView
-	instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel
-		widthAnnotations widthDiffInfo numberOfLines acceptColor
-		cancelColor diffColor menuHolder currentBlockNodeHolder
-		showLineNumbers'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CodeView2
+        instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel
+                widthAnnotations widthDiffInfo numberOfLines acceptColor
+                cancelColor diffColor menuHolder currentBlockNodeHolder
+                showLineNumbers'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CodeView2
 !
 
 CodeView subclass:#TextView
-	instanceVariableNames:'listOriginal codeView gutterView diffMode deletedLines
-		insertedLines lastFirstLine changedLines scrollInProgress
-		originDiffText emptyLines changedDiffText suppressNotifications
-		reallyModifiedChannel'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CodeView2
+        instanceVariableNames:'listOriginal codeView gutterView diffMode deletedLines
+                insertedLines lastFirstLine changedLines scrollInProgress
+                originDiffText emptyLines changedDiffText suppressNotifications
+                reallyModifiedChannel'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CodeView2
 !
 
 !CodeView2 class methodsFor:'documentation'!
@@ -2390,9 +2390,9 @@
     widthAnnotations := "16"8.
     widthDiffInfo := 5.
 
-    acceptColor := Color green lighter onDevice:device.
-    cancelColor := Color red lighter lighter onDevice:device.
-    diffColor := Color yellow lighter lighter onDevice:device.
+    acceptColor := Color green lighter onDevice:self graphicsDevice.
+    cancelColor := Color red lighter lighter onDevice:self graphicsDevice.
+    diffColor := Color yellow lighter lighter onDevice:self graphicsDevice.
 
     "Created: / 16-06-2011 / 13:47:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -2609,7 +2609,7 @@
         ].
         newFont ~~ oldFont ifTrue:[
             "/ ensure that the line number lines are not higher than the text lines
-            (newFont heightOn:device) > (textView font heightOn:device) ifTrue:[
+            (newFont heightOn:device) > (textView font heightOn:self graphicsDevice) ifTrue:[
                 newFont := textView font.
             ].
             newFont ~~ oldFont ifTrue:[
@@ -2618,17 +2618,17 @@
         ].
     ].
 
-    fontAscent := textView font ascentOn:device.
-    fontDescent := textView font descentOn:device.
+    fontAscent := textView font ascentOn:self graphicsDevice.
+    fontDescent := textView font descentOn:self graphicsDevice.
 
 
     yTop := (self yOfTextViewLine:line) ? 0.
     yBaseline := yTop + fontAscent.
 
     cleared ifFalse:[
-        self clearRectangleX:0 y:yBaseline - font ascent
-            width: width - 2
-            height: font ascent + font descent.
+        self clearRectangleX:0 y:yBaseline - gc font ascent
+            width:width - 2
+            height:gc font ascent + gc font descent.
     ].
 
     "/ cg: this should be done differently: services know about the
@@ -2640,7 +2640,7 @@
         codeView notNil ifTrue:[
             codeView
                 drawLine:line in: self
-                atX: self acceptCancelRight + 1 y:yBaseline width: widthAnnotations height: font height
+                atX: self acceptCancelRight + 1 y:yBaseline width: widthAnnotations height:gc font height
                 from:nil to:nil with:self paint and: self backgroundColor.
         ]
     ].
@@ -2662,9 +2662,9 @@
     "/ of accept/cancel bar !!
     cleared ifFalse:[
         "/ In that case it was cleared above.
-        self redrawAcceptCancelBarX:0 y:yBaseline - font ascent
-            width: width - 2
-           height: font ascent + font descent.
+        self redrawAcceptCancelBarX:0 y:yBaseline - gc font ascent
+            width:width - 2
+           height:gc font ascent + gc font descent.
     ].
     ^ requiredW.
 
@@ -3851,15 +3851,15 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.133 2014-02-14 18:00:21 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.134 2014-02-18 17:04:48 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.133 2014-02-14 18:00:21 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.134 2014-02-18 17:04:48 stefan Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st,v 1.133 2014-02-14 18:00:21 vrany Exp $'
+    ^ '$Id: Tools__CodeView2.st,v 1.134 2014-02-18 17:04:48 stefan Exp $'
 ! !