--- a/DataSetColumn.st	Fri Jul 31 09:11:25 1998 +0200
+++ b/DataSetColumn.st	Fri Jul 31 09:18:55 1998 +0200
@@ -595,7 +595,7 @@
 !
 
 resolveLabelWithBuilder:aBuilder
-    |label appl|
+    |label appl l2|
 
     aBuilder isNil ifTrue:[
         ^ description rawLabel        
@@ -606,13 +606,17 @@
             aBuilder isEditing ifTrue:[
                 label := nil
             ] ifFalse:[
-                label := aBuilder labelFor:(label asSymbol)
+                (label := aBuilder labelFor:(label asSymbol)) notNil ifTrue:[
+                    ^ label
+                ]
             ].
-            ^ label ? description class defaultIcon
+            ^ description class defaultIcon
         ].
         description translateLabel == true ifTrue:[
             (appl := aBuilder application) notNil ifTrue:[
-                ^ (appl resources string:label) ? label
+                (l2 := appl resources string:label) notNil ifTrue:[
+                    ^ l2
+                ]
             ]
         ]
     ].
@@ -755,5 +759,5 @@
 !DataSetColumn class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.25 1998-07-31 07:10:26 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetColumn.st,v 1.26 1998-07-31 07:18:55 ca Exp $'
 ! !