--- a/HorizontalScrollBar.st	Thu May 02 18:33:21 1996 +0200
+++ b/HorizontalScrollBar.st	Sat May 04 01:07:52 1996 +0200
@@ -90,44 +90,44 @@
     thumbWidth := width - leftAndRightWidth - borderWidth - (elementSpacing * 3).
 "
     ((buttonLayout ~~ #top) and:[buttonLayout ~~ #bottom]) ifTrue:[
-	thumbWidth := thumbWidth - borderWidth
+        thumbWidth := thumbWidth - borderWidth
     ].
 "
     buttonLayout == #around ifTrue:[
-	thumbWidth := thumbWidth + borderWidth
+        thumbWidth := thumbWidth + borderWidth
     ].
 
     "if I become too small, hide buttons"
 
     width < leftAndRightWidth ifTrue:[
-	b1Hidden := b2Hidden := thumbHidden := true.
+        b1Hidden := b2Hidden := thumbHidden := true.
     ] ifFalse:[
-	b1Hidden := b2Hidden := thumbHidden := false.
+        b1Hidden := b2Hidden := thumbHidden := false.
     ].
 
     (thumbWidth < 10) ifTrue:[
-	thumbHidden := true.
+        thumbHidden := true.
     ] ifFalse:[
-	thumbHidden := false.
+        thumbHidden := false.
     ].
 
     button1 hiddenOnRealize:b1Hidden.
     b1Hidden ifTrue:[
-	button1 unrealize
+        button1 unmap
     ] ifFalse:[
-	shown ifTrue:[button1 realize]
+        shown ifTrue:[button1 realize]
     ].
     button2 hiddenOnRealize:b1Hidden.
     b2Hidden ifTrue:[
-	button2 unrealize
+        button2 unmap
     ] ifFalse:[
-	shown ifTrue:[button2 realize]
+        shown ifTrue:[button2 realize]
     ].
     thumb hiddenOnRealize:thumbHidden.
     thumbHidden ifTrue:[
-	thumb unrealize
+        thumb unmap
     ] ifFalse:[
-	shown ifTrue:[thumb realize]
+        shown ifTrue:[thumb realize]
     ].
 
     "height of buttons is always my width"
@@ -135,18 +135,18 @@
     h := height - (margin * 2).
 
     (h ~~ button1 height) ifTrue:[
-	button1 height:h.
-	button2 height:h
+        button1 height:h.
+        button2 height:h
     ].
 
     thumbHeight := h.
     style := styleSheet name.
     style == #next ifTrue:[
-	thumbHeight := thumbHeight - (thumb borderWidth * 2).
-	thumbWidth := thumbWidth - 1
+        thumbHeight := thumbHeight - (thumb borderWidth * 2).
+        thumbWidth := thumbWidth - 1
     ].
     style == #motif ifTrue:[
-	thumbWidth := thumbWidth - margin
+        thumbWidth := thumbWidth - margin
     ].
 
     "
@@ -154,51 +154,53 @@
      avoid error from view-creation (it will be hidden anyway)
     "
     thumbWidth <= 0 ifTrue:[
-	thumbWidth := 1
+        thumbWidth := 1
     ].
 
     (buttonLayout == #bottom) ifTrue:[
-	"buttons at left"
-	thumb extent:(thumbWidth @ thumbHeight).
-	^ self
+        "buttons at left"
+        thumb extent:(thumbWidth @ thumbHeight).
+        ^ self
     ].
 
     sep2 := elementSpacing * 2.
     (buttonLayout == #top) ifTrue:[
-	"buttons at right"
-	thumbWidth := thumbWidth + borderWidth.
-	thumbHidden ifTrue:[
-	    bX := elementSpacing
-	] ifFalse:[
-	    bX := thumbWidth + sep2.
-	].
-	(how == #smaller) ifTrue:[
-	    thumb extent:(thumbWidth @ thumbHeight).
-	    button1 origin:(bX @ bwn).
-	    button2 origin:((bX + leftWidth) @ bwn)
-	] ifFalse:[
-	    button1 origin:(bX @ bwn).
-	    button2 origin:((bX + leftWidth) @ bwn).
-	    thumb extent:(thumbWidth @ thumbHeight)
-	].
-	^ self
+        "buttons at right"
+        thumbWidth := thumbWidth + borderWidth.
+        thumbHidden ifTrue:[
+            bX := elementSpacing
+        ] ifFalse:[
+            bX := thumbWidth + sep2.
+        ].
+        (how == #smaller) ifTrue:[
+            thumb extent:(thumbWidth @ thumbHeight).
+            button1 origin:(bX @ bwn).
+            button2 origin:((bX + leftWidth) @ bwn)
+        ] ifFalse:[
+            button1 origin:(bX @ bwn).
+            button2 origin:((bX + leftWidth) @ bwn).
+            thumb extent:(thumbWidth @ thumbHeight)
+        ].
+        ^ self
     ].
     "button around thumb"
 
     style == #motif ifTrue:[
-	sep2 := sep2 + 1
+        sep2 := sep2 + 1
     ].
 
     button1 origin:(bwn @ bwn).
     style == #os2 ifTrue:[
-	button2 origin:((leftWidth + thumbWidth + sep2 - margin) @ bwn).
-	thumb extent:((thumbWidth - margin - margin) @ thumbHeight).
-	thumb origin:((leftWidth - borderWidth + elementSpacing + margin) @ bwn)
+        button2 origin:((leftWidth + thumbWidth + sep2 - margin) @ bwn).
+        thumb extent:((thumbWidth - margin - margin) @ thumbHeight).
+        thumb origin:((leftWidth - borderWidth + elementSpacing + margin) @ bwn)
     ] ifFalse:[
-	button2 origin:((leftWidth + thumbWidth + sep2 - (margin // 2)) @ bwn).
-	thumb extent:((thumbWidth + margin - (margin // 2)) @ thumbHeight).
-	thumb origin:((leftWidth - borderWidth + elementSpacing) @ bwn)
+        button2 origin:((leftWidth + thumbWidth + sep2 - (margin // 2)) @ bwn).
+        thumb extent:((thumbWidth + margin - (margin // 2)) @ thumbHeight).
+        thumb origin:((leftWidth - borderWidth + elementSpacing) @ bwn)
     ].
+
+    "Modified: 3.5.1996 / 23:47:30 / stefan"
 ! !
 
 !HorizontalScrollBar methodsFor:'initialization'!
@@ -292,5 +294,5 @@
 !HorizontalScrollBar class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/HorizontalScrollBar.st,v 1.17 1996-04-25 17:22:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/HorizontalScrollBar.st,v 1.18 1996-05-03 23:07:52 stefan Exp $'
 ! !