--- a/ScrollableView.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/ScrollableView.st	Tue Oct 21 20:15:06 1997 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 5:48:38 pm'                  !
+
 SimpleView subclass:#ScrollableView
 	instanceVariableNames:'scrolledView vScrollBar hScrollBar scrollBarPosition lockUpdates
 		hideScrollBars hasHorizontalScrollBar hasVerticalScrollBar
@@ -861,7 +863,10 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#scrolledViewLevel #scrolledViewMargin)>
+    <resource: #style (#'scrolledView.level' #'scrolledView.margin'
+                       #'scrolledView.borderWidth'
+                       #'scrollBarSpacing' #'scrollBarLevel'
+                       #'scrollableViewLevel' #'scrollableViewBackgroundColor' )>
 
     |defLevel defMargin defSpacing|
 
@@ -874,9 +879,9 @@
         defMargin := 0.
         defSpacing := 0
     ].
-    DefaultScrolledViewLevel := StyleSheet at:'scrolledViewLevel' default:defLevel.
-    DefaultScrolledViewBorderWidth := StyleSheet at:'scrolledViewBorderWidth' default:nil.
-    DefaultScrolledViewMargin := StyleSheet at:'scrolledViewMargin' default:defMargin.
+    DefaultScrolledViewLevel := StyleSheet at:'scrolledView.level' default:defLevel.
+    DefaultScrolledViewBorderWidth := StyleSheet at:'scrolledView.borderWidth' default:nil.
+    DefaultScrolledViewMargin := StyleSheet at:'scrolledView.margin' default:defMargin.
     DefaultScrollBarSpacing := StyleSheet at:'scrollBarSpacing' default:defSpacing.
     DefaultLevel := StyleSheet at:'scrollableViewLevel' default:nil.
     DefaultScrollBarLevel := StyleSheet at:'scrollBarLevel' default:nil.
@@ -886,7 +891,7 @@
      self updateStyleCache
     "
 
-    "Modified: 7.3.1997 / 15:03:37 / cg"
+    "Modified: 20.10.1997 / 15:13:10 / cg"
 ! !
 
 !ScrollableView methodsFor:'accessing-behavior'!
@@ -1574,8 +1579,9 @@
         scrolledViewLayout topOffset:sTopOffs.
         scrolledViewLayout bottomOffset:sBottomOffs.
 
-        ((hScrollBar isNil or:[hScrollBarHidden])
-        and:[(vScrollBar isNil or:[vScrollBarHidden])]) ifTrue:[
+        (hideScrollBars not
+        and:[(hScrollBar isNil or:[hScrollBarHidden])
+        and:[(vScrollBar isNil or:[vScrollBarHidden])]]) ifTrue:[
             scrolledView level:0
         ] ifFalse:[
             scrolledView level:DefaultScrolledViewLevel.
@@ -1602,7 +1608,7 @@
     ].
 
     "Created: 6.3.1997 / 18:06:23 / cg"
-    "Modified: 19.3.1997 / 16:33:56 / cg"
+    "Modified: 20.10.1997 / 17:47:46 / cg"
 !
 
 setupVertical:isVertical mini:miniV horizontal:isHorizontal mini:miniH 
@@ -1881,5 +1887,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.72 1997-10-11 15:56:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.73 1997-10-21 18:12:28 cg Exp $'
 ! !