--- a/SelectionInTreeView.st	Tue Feb 18 17:47:45 2014 +0100
+++ b/SelectionInTreeView.st	Tue Feb 18 17:50:20 2014 +0100
@@ -261,7 +261,7 @@
 
     col = lineColor ifFalse:[
         lineColor := col.
-        lineColor notNil ifTrue:[lineColor := lineColor onDevice:device].
+        lineColor notNil ifTrue:[lineColor := lineColor onDevice:self graphicsDevice].
         self invalidate
     ]
 !
@@ -451,7 +451,7 @@
 
     anImage isNil ifTrue:[^ anImage].
 
-    deviceImage := anImage onDevice:device.
+    deviceImage := anImage onDevice:self graphicsDevice.
     deviceImage isImage ifTrue:[
         deviceImage clearMaskedPixels.
     ].
@@ -649,7 +649,7 @@
         self redrawX:0 y:y0 width:width height:h.
         self waitForExpose.
     ].
-    device flush.
+    self flush.
     self contentsChanged.
 !
 
@@ -1217,7 +1217,7 @@
     startY  := self yOfVisibleLine:visStart.
     dltLine := startLn - visStart.
     stopLn  := dltLine + visEnd.
-    savClip := clipRect.
+    savClip := self clippingBoundsOrNil.
 
     self clippingRectangle:(Rectangle left:x top:y width:w height:h).
 
@@ -1496,12 +1496,12 @@
 
 create
     super create.
-    lineMask := lineMask onDevice:device.
+    lineMask := lineMask onDevice:self graphicsDevice.
 
     lineColor := lineColor isNil ifTrue:[fgColor]
-                                ifFalse:[lineColor onDevice:device].
-
-    editValueFgColor := editValueFgColor onDevice:device.
+                                ifFalse:[lineColor onDevice:self graphicsDevice].
+
+    editValueFgColor := editValueFgColor onDevice:self graphicsDevice.
 !
 
 fetchDefaultImages
@@ -1870,7 +1870,7 @@
     ) ifTrue:[   
         ^ self
     ].
-    editorWidget withAllSubViewsDo:[:v| v font:font ].
+    editorWidget withAllSubViewsDo:[:v| v font:gc font ].
 
     y0 := self yOfVisibleLine:y0.
     x0 := self xOfValueNode:node.
@@ -2502,10 +2502,10 @@
 !SelectionInTreeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.119 2013-09-06 12:24:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.120 2014-02-18 16:50:20 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.119 2013-09-06 12:24:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/SelectionInTreeView.st,v 1.120 2014-02-18 16:50:20 stefan Exp $'
 ! !