--- a/ListModelView.st	Wed Apr 17 17:18:36 2013 +0200
+++ b/ListModelView.st	Wed Apr 17 18:34:41 2013 +0200
@@ -2647,7 +2647,7 @@
     xNxt := xSplitbars first - xTrs.
     colInset := self splitbarInset.
 
-    x0   := colNr ~~ 1 ifTrue:[(xSplitbars at:colNr - 1)] ifFalse:[0].       
+    colNr ~~ 1 ifTrue:[x0 := (xSplitbars at:colNr - 1)] ifFalse:[x0 := 0].       
     x1 := (xSplitbars at:colNr) " - xTrs".
 
     "/ workaround due to drawing the selection frame
@@ -2898,7 +2898,7 @@
     (drawSelector := dataSetColumnSpec drawSelector) notNil ifTrue:[
         "/ Set clip rect to make sure nobody can draw outside the cell
         deviceClipRectangle := aGC clippingRectangleOrNil.
-"/        aGC clippingRectangle:(Rectangle left:x top:y width:w height:h).
+        aGC clippingRectangle:(Rectangle left:x top:y width:w height:h).
         drawSelector numArgs == 5 ifTrue:[
             aReceiver perform:  drawSelector with: aGC with: x with: y with: w with: h.
         ] ifFalse:[
@@ -2909,9 +2909,10 @@
             ]
         ].
         aGC deviceClippingRectangle:deviceClipRectangle.
-        ^self.
     ].
 
+    drawSelector notNil ifTrue:[ ^ self ].
+
     ClipColumnQuerySignal handle:[:ex|
         deviceClipRectangle isNil ifTrue:[
             deviceClipRectangle := aGC clippingRectangleOrNil.
@@ -3146,11 +3147,11 @@
 !ListModelView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.127 2013-04-17 15:18:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.128 2013-04-17 16:34:41 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.127 2013-04-17 15:18:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.128 2013-04-17 16:34:41 vrany Exp $'
 ! !