--- a/DataSetLabel.st	Tue Oct 26 19:51:26 1999 +0200
+++ b/DataSetLabel.st	Wed Oct 27 14:22:45 1999 +0200
@@ -1,18 +1,12 @@
 Object subclass:#DataSetLabel
 	instanceVariableNames:'label selector argument adjust font fgColor bgColor
-		preferredHeight preferredWidth labelIsButton'
+		preferredHeight preferredWidth'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Views-DataSet'
 !
 
 
-!DataSetLabel methodsFor:'accessing'!
-
-labelIsButton
-    ^ labelIsButton
-! !
-
 !DataSetLabel methodsFor:'accessing colors'!
 
 backgroundColor
@@ -116,14 +110,13 @@
 description:aDescription builder:aBuilder on:aGC
     |device gcFont|
 
-    label    := self resolveLabelFromDescription:aDescription withBuilder:aBuilder.
-    selector := aDescription labelActionSelector.
-    argument := (aDescription labelActionArgument) ? label.
-    adjust   := (aDescription labelAlignment) ? #left.
-    device   := aGC device.
-    fgColor  := aDescription labelForegroundColor.
-    bgColor  := aDescription labelBackgroundColor.
-    labelIsButton := aDescription labelIsButton.
+    label           := self resolveLabelFromDescription:aDescription withBuilder:aBuilder.
+    selector        := aDescription  labelActionSelector.
+    argument        := (aDescription labelActionArgument) ? label.
+    adjust          := (aDescription labelAlignment) ? #left.
+    device          := aGC device.
+    fgColor         := aDescription labelForegroundColor.
+    bgColor         := aDescription labelBackgroundColor.
 
     fgColor notNil ifTrue:[ fgColor := fgColor onDevice:device ].
     bgColor notNil ifTrue:[ bgColor := bgColor onDevice:device ].
@@ -241,6 +234,16 @@
 
 !DataSetLabel methodsFor:'queries'!
 
+hasSeparator
+    |l|
+
+    label size == 1 ifTrue:[
+"/        ^ (label at:1) ~= 'Alarm'
+        ^ (label at:1) ~= 'Area'
+    ].
+    ^ true
+!
+
 isSelectable
     "returns true if the item is selectable; a valid selector
      to notify the receiver for a release button event exists
@@ -253,5 +256,5 @@
 !DataSetLabel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.7 1999-10-14 07:51:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetLabel.st,v 1.8 1999-10-27 12:22:45 ca Exp $'
 ! !