--- a/ScrollBar.st	Fri Oct 23 14:28:13 2009 +0200
+++ b/ScrollBar.st	Fri Oct 23 17:21:28 2009 +0200
@@ -435,7 +435,7 @@
 
     (button1 isNil or:[thumb isNil or:[button2 isNil]]) ifTrue:[^ self].
 
-    bw := borderWidth.
+    bw := self borderWidth.
     bwn := bw negated + margin.
     m2 := margin * 2.
 
@@ -802,7 +802,7 @@
 
     <resource: #style (#'scrollBar.disableButtons')>
 
-    |clr style|
+    |clr style bw|
 
     orientation isNil ifTrue:[
         orientation := #vertical
@@ -819,11 +819,12 @@
     button1 autoRepeat:true.
     button2 autoRepeat:true.
 
-    button1 borderWidth:borderWidth.
+    bw := self borderWidth.
+    button1 setBorderWidth:bw.
     DefaultScrollerBordered ifFalse:[
-        thumb borderWidth:borderWidth.
+        thumb setBorderWidth:bw.
     ].
-    button2 borderWidth:borderWidth.
+    button2 setBorderWidth:bw.
 
     style := styleSheet name.
     ((style = #iris) and:[Screen current hasGrayscales]) ifTrue:[
@@ -870,9 +871,10 @@
 setElementPositions
     "position sub-components"
 
-    |bwn|
+    |bw bwn|
 
-    bwn := borderWidth negated + margin.
+    bw := self borderWidth.
+    bwn := bw negated + margin.
 
     orientation == #horizontal ifTrue:[
         (buttonLayout == #bottom) ifTrue:[
@@ -882,7 +884,7 @@
             button2 origin:(button1 width @ bwn).
             button2 viewGravity:#West.
             thumb origin:((button1 width 
-                           + borderWidth 
+                           + bw 
                            + button2 width 
                            + elementSpacing + elementSpacing) @ bwn).
             thumb viewGravity:#West.
@@ -910,7 +912,7 @@
             button2 origin:(bwn @ (button1 height)).
             button2 viewGravity:#North.
             thumb origin:(bwn @ (button1 height 
-                                 + borderWidth 
+                                 + bw 
                                  + button2 height 
                                  + elementSpacing 
                                  + elementSpacing)).
@@ -1184,5 +1186,9 @@
 !ScrollBar class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.86 2009-02-26 21:23:32 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.87 2009-10-23 15:21:28 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.87 2009-10-23 15:21:28 cg Exp $'
 ! !