--- a/DataSetColumn.st	Fri Nov 18 15:56:28 2005 +0100
+++ b/DataSetColumn.st	Mon Nov 21 19:48:37 2005 +0100
@@ -819,7 +819,7 @@
     val := self extractColFromRow:row rowNr:aRowNr.
 
     val isText ifTrue:[val := val string].
-    ^ description editorOn:row column:self value:val usingAdaptor:columnAdaptor.
+    ^ description editorOn:row at:aRowNr column:self value:val usingAdaptor:columnAdaptor.
 ! !
 
 !DataSetColumn methodsFor:'event handling'!
@@ -1012,6 +1012,17 @@
     ^ row perform:s withOptionalArgument:columnNumber and:aRowNr and:dataSet
 !
 
+choicesFor:aRow at:aRowNr
+    |choicesSelector|
+
+    choicesSelector := description choices.
+
+    columnAdaptor notNil ifTrue:[
+        ^ columnAdaptor perform:choicesSelector withOptionalArgument:aRow and:columnNumber and:aRowNr and:dataSet
+    ].
+    ^ aRow perform:choicesSelector withOptionalArgument:aRowNr and:columnNumber and:dataSet
+!
+
 containsText
     "returns true if text might exist
     "
@@ -1031,7 +1042,10 @@
 !
 
 hasChoices:aRowNr
-    ^ (description choicesFor:(dataSet at:aRowNr)) notNil
+    |row|
+
+    row := dataSet at:aRowNr.
+    ^ (self choicesFor:row at:aRowNr) notNil
 !
 
 hasPotentialNonConstantBackground
@@ -1183,5 +1197,5 @@
 !DataSetColumn class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.100 2005-11-18 14:56:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.101 2005-11-21 18:48:37 cg Exp $'
 ! !