--- a/HorizontalScrollBar.st	Wed Oct 13 02:01:27 1993 +0100
+++ b/HorizontalScrollBar.st	Wed Oct 13 02:04:14 1993 +0100
@@ -27,7 +27,7 @@
 2 step-scroll buttons. when moved or stepped, it perform a
 predefined action.
 
-%W% %E%
+$Header: /cvs/stx/stx/libwidg/HorizontalScrollBar.st,v 1.2 1993-10-13 01:02:21 claus Exp $
 
 written spring/summer 89 by claus
 '!
@@ -36,7 +36,7 @@
 
 scrollLeftButtonForm:style
     defaultScrollLeftForm isNil ifTrue:[
-        defaultScrollLeftForm := Form fromFile:(Resources at:'LEFT_BUTTON_FORM_FILE'
+        defaultScrollLeftForm := Form fromFile:(self classResources at:'SCROLL_LEFT_BUTTON_FORM_FILE'
                                                      default:(style == #mswindows
                                                                  ifTrue:['ScrollLt_win.xbm']
                                                                  ifFalse:['ScrollLt.xbm']))
@@ -66,7 +66,7 @@
 
 scrollRightButtonForm:style
     defaultScrollRightForm isNil ifTrue:[
-        defaultScrollRightForm := Form fromFile:(Resources at:'RIGHT_BUTTON_FORM_FILE'
+        defaultScrollRightForm := Form fromFile:(self classResources at:'SCROLL_RIGHT_BUTTON_FORM_FILE'
                                                       default:(style == #mswindows
                                                                  ifTrue:['ScrollRt_win.xbm']
                                                                  ifFalse:['ScrollRt.xbm']))
@@ -114,12 +114,6 @@
     ].
     self extent:w @ h.
 
-    style == #mswindows ifTrue:[
-        layout := #around
-    ] ifFalse:[
-        layout := defaultLayout
-    ].
-
     bwn := borderWidth negated.
     self is3D ifTrue:[
         sep := 1
@@ -127,11 +121,13 @@
         sep := 0
     ].
 
+    button1 := ArrowButton leftIn:self.
     button1 form:(self class scrollLeftButtonForm:style).
     button1 name:'LeftButton'.
     button1 borderWidth:borderWidth.
     button1 autoRepeat.
 
+    button2 := ArrowButton rightIn:self.
     button2 form:(self class scrollRightButtonForm:style).
     button2 name:'RightButton'.
     button2 borderWidth:borderWidth.