Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Tue, 21 Oct 1997 20:15:06 +0200
changeset 1354 c260c896ea66
parent 1353 5dac6aa6ac96
child 1355 6725ab9cc6f5
*** empty log message ***
EditField.st file | annotate | diff | comparison | revisions
ListView.st file | annotate | diff | comparison | revisions
MiniScr.st file | annotate | diff | comparison | revisions
MiniScroller.st file | annotate | diff | comparison | revisions
PopUpMenu.st file | annotate | diff | comparison | revisions
PullDMenu.st file | annotate | diff | comparison | revisions
PullDownMenu.st file | annotate | diff | comparison | revisions
ScrView.st file | annotate | diff | comparison | revisions
ScrollableView.st file | annotate | diff | comparison | revisions
Scroller.st file | annotate | diff | comparison | revisions
SelListV.st file | annotate | diff | comparison | revisions
SelectionInListView.st file | annotate | diff | comparison | revisions
Workspace.st file | annotate | diff | comparison | revisions 
--- a/EditField.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/EditField.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 3:03:08 pm'                  !
+
 EditTextView subclass:#EditField
 	instanceVariableNames:'leaveAction enabled clickAction crAction tabAction converter
 		leaveKeys immediateAccept acceptOnLeave acceptOnReturn
@@ -788,21 +790,21 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#editFieldForegroundColor #editFieldBackgroundColor
-                       #editFieldSelectionForegroundColor #editFieldSelectionBackgroundColor
-                       #editFieldFont)>
+    <resource: #style (#'editField.foregroundColor' #'editField.backgroundColor'
+                       #'editField.selectionForegroundColor' #'editFieldSelectionBackgroundColor'
+                       #'editField.font')>
 
-    DefaultForegroundColor := StyleSheet colorAt:'editFieldForegroundColor' default:Black.
-    DefaultBackgroundColor := StyleSheet colorAt:'editFieldBackgroundColor' default:White.
-    DefaultSelectionForegroundColor := StyleSheet colorAt:'editFieldSelectionForegroundColor' default:DefaultBackgroundColor.
-    DefaultSelectionBackgroundColor := StyleSheet colorAt:'editFieldSelectionBackgroundColor' default:DefaultForegroundColor.
-    DefaultFont := StyleSheet fontAt:'editFieldFont' default:nil.
+    DefaultForegroundColor := StyleSheet colorAt:'editField.foregroundColor' default:Black.
+    DefaultBackgroundColor := StyleSheet colorAt:'editField.backgroundColor' default:White.
+    DefaultSelectionForegroundColor := StyleSheet colorAt:'editField.selectionForegroundColor' default:DefaultBackgroundColor.
+    DefaultSelectionBackgroundColor := StyleSheet colorAt:'editField.selectionBackgroundColor' default:DefaultForegroundColor.
+    DefaultFont := StyleSheet fontAt:'editField.font' default:nil.
 
     "
      self updateStyleCache
     "
 
-    "Modified: 1.3.1996 / 13:45:43 / cg"
+    "Modified: 20.10.1997 / 15:02:07 / cg"
 ! !
 
 !EditField methodsFor:'accepting'!
@@ -1943,5 +1945,5 @@
 !EditField class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.95 1997-07-26 14:24:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.96 1997-10-21 18:13:32 cg Exp $'
 ! !
--- a/ListView.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/ListView.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 3:05:41 pm'                  !
+
 View subclass:#ListView
 	instanceVariableNames:'list firstLineShown leftOffset nFullLinesShown nLinesShown
 		fgColor bgColor partialLines leftMargin topMargin textStartLeft
@@ -333,17 +335,17 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#textForegroundColor #textBackgroundColor
-		       #textTabPositions
-		       #textFont)>
-
-    DefaultForegroundColor := StyleSheet colorAt:'textForegroundColor' default:Black.
-    DefaultBackgroundColor := StyleSheet colorAt:'textBackgroundColor' default:White.
-    DefaultFont := StyleSheet fontAt:'textFont'.
-    DefaultTabPositions := StyleSheet at:'textTabPositions'.
+    <resource: #style (#'text.foregroundColor' #'text.backgroundColor'
+                       #'text.tabPositions'
+                       #'text.font')>
+
+    DefaultForegroundColor := StyleSheet colorAt:'text.foregroundColor' default:Black.
+    DefaultBackgroundColor := StyleSheet colorAt:'text.backgroundColor' default:White.
+    DefaultFont := StyleSheet fontAt:'text.font'.
+    DefaultTabPositions := StyleSheet at:'text.tabPositions'.
     DefaultTabPositions isNil ifTrue:[DefaultTabPositions := self defaultTabPositions].
 
-    "Modified: 1.3.1996 / 13:45:34 / cg"
+    "Modified: 20.10.1997 / 15:05:30 / cg"
 ! !
 
 !ListView methodsFor:'accessing'!
@@ -3754,5 +3756,5 @@
 !ListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.143 1997-10-16 13:20:50 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.144 1997-10-21 18:13:11 cg Exp $'
 ! !
--- a/MiniScr.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/MiniScr.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 3:07:01 pm'                  !
+
 Scroller subclass:#MiniScroller
 	instanceVariableNames:''
 	classVariableNames:'MiniScrollerSize'
@@ -47,16 +49,16 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#miniScrollerSize)>
+    <resource: #style (#'miniScroller.size')>
 
-    MiniScrollerSize := StyleSheet at:'miniScrollerSize'.
+    MiniScrollerSize := StyleSheet at:'miniScroller.size'.
 
     "
      self updateStyleCache
     "
 
     "Created: 15.8.1997 / 01:51:38 / cg"
-    "Modified: 15.8.1997 / 01:54:44 / cg"
+    "Modified: 20.10.1997 / 15:06:36 / cg"
 ! !
 
 !MiniScroller methodsFor:'initialization'!
@@ -142,5 +144,5 @@
 !MiniScroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/MiniScr.st,v 1.17 1997-08-15 11:04:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/MiniScr.st,v 1.18 1997-10-21 18:13:10 cg Exp $'
 ! !
--- a/MiniScroller.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/MiniScroller.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 3:07:01 pm'                  !
+
 Scroller subclass:#MiniScroller
 	instanceVariableNames:''
 	classVariableNames:'MiniScrollerSize'
@@ -47,16 +49,16 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#miniScrollerSize)>
+    <resource: #style (#'miniScroller.size')>
 
-    MiniScrollerSize := StyleSheet at:'miniScrollerSize'.
+    MiniScrollerSize := StyleSheet at:'miniScroller.size'.
 
     "
      self updateStyleCache
     "
 
     "Created: 15.8.1997 / 01:51:38 / cg"
-    "Modified: 15.8.1997 / 01:54:44 / cg"
+    "Modified: 20.10.1997 / 15:06:36 / cg"
 ! !
 
 !MiniScroller methodsFor:'initialization'!
@@ -142,5 +144,5 @@
 !MiniScroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/MiniScroller.st,v 1.17 1997-08-15 11:04:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/MiniScroller.st,v 1.18 1997-10-21 18:13:10 cg Exp $'
 ! !
--- a/PopUpMenu.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/PopUpMenu.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 3:09:17 pm'                  !
+
 PopUpView subclass:#PopUpMenu
 	instanceVariableNames:'menuView lastSelection memorize hideOnLeave actionLabels
 		actionLines actionValues hideOnRelease defaultHideOnRelease'
@@ -668,11 +670,11 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#popupHideOnRelease)>
+    <resource: #style (#'popup.hideOnRelease')>
 
-    DefaultHideOnRelease := StyleSheet at:#popupHideOnRelease default:true.
+    DefaultHideOnRelease := StyleSheet at:'popup.hideOnRelease' default:true.
 
-    "Modified: 17.1.1997 / 23:19:29 / cg"
+    "Modified: 20.10.1997 / 15:08:44 / cg"
 ! !
 
 !PopUpMenu methodsFor:'ST-80 activation'!
@@ -702,7 +704,7 @@
      Modal - i.e. stay in the menu until finished.
      This is the ST-80 way of launching a menu."
 
-    |return rec sel0 sel1 arg|
+    |return rec sel0 sel1 arg myAction|
 
     return := 0.
 "/    menuView args notNil ifTrue:[
@@ -719,6 +721,7 @@
     "/
 
     menuView action isNil ifTrue:[
+        myAction := true.
         menuView action:[:menuView :selected |
             |actionIndex value sel retVal selIdx
              args selectors checkFlags check|
@@ -786,6 +789,7 @@
     ] ifFalse:[
         self showAt:aPoint.
     ].
+    myAction == true ifTrue:[menuView action:nil].
 
     "/ 
     "/ mhmh an ST/X menu started the ST-80 way
@@ -806,7 +810,7 @@
     "
 
     "Created: 10.1.1996 / 20:11:42 / cg"
-    "Modified: 2.4.1997 / 16:03:23 / cg"
+    "Modified: 17.10.1997 / 02:34:52 / cg"
 !
 
 startUpWithHeading:aString
@@ -1324,5 +1328,5 @@
 !PopUpMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.66 1997-07-28 10:25:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.67 1997-10-21 18:12:31 cg Exp $'
 ! !
--- a/PullDMenu.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/PullDMenu.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 2:10:38 pm'                  !
+
 View subclass:#PullDownMenu
 	instanceVariableNames:'receiver menus titles selectors activeMenuNumber
 		showSeparatingLines topMargin fgColor bgColor activeFgColor
@@ -364,62 +366,62 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#pullDownMenuViewBackground #menuViewBackground
-                       #pullDownMenuForegroundColor #menuForegroundColor
-                       #pullDownMenuBackgroundColor #menuBackgroundColor
-                       #pullDownMenuHilightForegroundColor #menuHilightForegroundColor
-                       #pullDownMenuHilightBackgroundColor #menuHilightBackgroundColor
-                       #pullDownMenuHilightLevel #menuHilightLevel
-                       #pullDownMenuEdgeStyle #pullDownMenuKeepMenu
-                       #pullDownMenuToggleKeep #pullDownMenuLevel
-                       #pullDownMenuFont #menuFont
-                       #pullDownMenuSeparatingLines)>
+    <resource: #style (#'pullDownMenu.viewBackground' #'menuView.background'
+                       #'pullDownMenu.foregroundColor' #'menu.foregroundColor'
+                       #'pullDownMenu.backgroundColor' #'menu.backgroundColor'
+                       #'pullDownMenu.hilightForegroundColor' #'menu.hilightForegroundColor'
+                       #'pullDownMenu.hilightBackgroundColor' #'menu.hilightBackgroundColor'
+                       #'pullDownMenu.hilightLevel' #'menu.hilightLevel'
+                       #'pullDownMenu.edgeStyle' #'pullDownMenu.keepMenu'
+                       #'pullDownMenu.toggleKeep' #'pullDownMenu.level'
+                       #'pullDownMenu.font' #'menu.font'
+                       #'pullDownMenu.separatingLines')>
 
     |styleSheet|
 
     styleSheet := StyleSheet.
 
-    DefaultViewBackground := styleSheet colorAt:'pullDownMenuViewBackground'.
+    DefaultViewBackground := styleSheet colorAt:'pullDownMenu.viewBackground'.
     DefaultViewBackground isNil ifTrue:[
-        DefaultViewBackground := styleSheet colorAt:'menuViewBackground'.
+        DefaultViewBackground := styleSheet colorAt:'menuView.background'.
     ].
-    DefaultForegroundColor := styleSheet colorAt:'pullDownMenuForegroundColor'.
+    DefaultForegroundColor := styleSheet colorAt:'pullDownMenu.foregroundColor'.
     DefaultForegroundColor isNil ifTrue:[
-        DefaultForegroundColor := styleSheet colorAt:'menuForegroundColor'.
+        DefaultForegroundColor := styleSheet colorAt:'menu.foregroundColor'.
     ].
-    DefaultBackgroundColor := styleSheet colorAt:'pullDownMenuBackgroundColor'.
+    DefaultBackgroundColor := styleSheet colorAt:'pullDownMenu.backgroundColor'.
     DefaultBackgroundColor isNil ifTrue:[
         DefaultViewBackground notNil ifTrue:[
             DefaultBackgroundColor := DefaultViewBackground
         ] ifFalse:[
-            DefaultBackgroundColor := styleSheet colorAt:'menuBackgroundColor'.
+            DefaultBackgroundColor := styleSheet colorAt:'menu.backgroundColor'.
         ]
     ].
-    DefaultHilightForegroundColor := styleSheet colorAt:'pullDownMenuHilightForegroundColor'.
+    DefaultHilightForegroundColor := styleSheet colorAt:'pullDownMenu.hilightForegroundColor'.
     DefaultHilightForegroundColor isNil ifTrue:[
-        DefaultHilightForegroundColor := styleSheet colorAt:'menuHilightForegroundColor'.
+        DefaultHilightForegroundColor := styleSheet colorAt:'menu.hilightForegroundColor'.
     ].
-    DefaultHilightBackgroundColor := styleSheet colorAt:'pullDownMenuHilightBackgroundColor'.
+    DefaultHilightBackgroundColor := styleSheet colorAt:'pullDownMenu.hilightBackgroundColor'.
     DefaultHilightBackgroundColor isNil ifTrue:[
-        DefaultHilightBackgroundColor := styleSheet colorAt:'menuHilightBackgroundColor'.
+        DefaultHilightBackgroundColor := styleSheet colorAt:'menu.hilightBackgroundColor'.
     ].
-    DefaultHilightLevel := styleSheet at:'pullDownMenuHilightLevel'.
+    DefaultHilightLevel := styleSheet at:'pullDownMenu.hilightLevel'.
     DefaultHilightLevel isNil ifTrue:[
-        DefaultHilightLevel := styleSheet at:'menuHilightLevel' default:0.
+        DefaultHilightLevel := styleSheet at:'menu.hilightLevel' default:0.
     ].
-    DefaultEdgeStyle := styleSheet at:'pullDownMenuEdgeStyle'.
-    DefaultKeepMenu := styleSheet at:'pullDownMenuKeepMenu' default:false.
-    DefaultToggleKeep := styleSheet at:'pullDownMenuToggleKeep' default:false.
-    DefaultLevel := styleSheet at:'pullDownMenuLevel' default:1.
-    DefaultFont := styleSheet fontAt:'pullDownMenuFont'.
-    DefaultFont isNil ifTrue:[DefaultFont := styleSheet fontAt:'menuFont'].
-    DefaultSeparatingLines := styleSheet at:'pullDownMenuSeparatingLines' default:false.
+    DefaultEdgeStyle := styleSheet at:'pullDownMenu.edgeStyle'.
+    DefaultKeepMenu := styleSheet at:'pullDownMenu.keepMenu' default:false.
+    DefaultToggleKeep := styleSheet at:'pullDownMenu.toggleKeep' default:false.
+    DefaultLevel := styleSheet at:'pullDownMenu.level' default:1.
+    DefaultFont := styleSheet fontAt:'pullDownMenu.font'.
+    DefaultFont isNil ifTrue:[DefaultFont := styleSheet fontAt:'menu.font'].
+    DefaultSeparatingLines := styleSheet at:'pullDownMenu.separatingLines' default:false.
 
     "
      PullDownMenu updateStyleCache
     "
 
-    "Modified: 1.3.1996 / 13:45:19 / cg"
+    "Modified: 20.10.1997 / 14:02:28 / cg"
 ! !
 
 !PullDownMenu methodsFor:'accessing'!
@@ -1741,5 +1743,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.77 1997-07-25 14:21:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.78 1997-10-21 18:15:06 cg Exp $'
 ! !
--- a/PullDownMenu.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/PullDownMenu.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 2:10:38 pm'                  !
+
 View subclass:#PullDownMenu
 	instanceVariableNames:'receiver menus titles selectors activeMenuNumber
 		showSeparatingLines topMargin fgColor bgColor activeFgColor
@@ -364,62 +366,62 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#pullDownMenuViewBackground #menuViewBackground
-                       #pullDownMenuForegroundColor #menuForegroundColor
-                       #pullDownMenuBackgroundColor #menuBackgroundColor
-                       #pullDownMenuHilightForegroundColor #menuHilightForegroundColor
-                       #pullDownMenuHilightBackgroundColor #menuHilightBackgroundColor
-                       #pullDownMenuHilightLevel #menuHilightLevel
-                       #pullDownMenuEdgeStyle #pullDownMenuKeepMenu
-                       #pullDownMenuToggleKeep #pullDownMenuLevel
-                       #pullDownMenuFont #menuFont
-                       #pullDownMenuSeparatingLines)>
+    <resource: #style (#'pullDownMenu.viewBackground' #'menuView.background'
+                       #'pullDownMenu.foregroundColor' #'menu.foregroundColor'
+                       #'pullDownMenu.backgroundColor' #'menu.backgroundColor'
+                       #'pullDownMenu.hilightForegroundColor' #'menu.hilightForegroundColor'
+                       #'pullDownMenu.hilightBackgroundColor' #'menu.hilightBackgroundColor'
+                       #'pullDownMenu.hilightLevel' #'menu.hilightLevel'
+                       #'pullDownMenu.edgeStyle' #'pullDownMenu.keepMenu'
+                       #'pullDownMenu.toggleKeep' #'pullDownMenu.level'
+                       #'pullDownMenu.font' #'menu.font'
+                       #'pullDownMenu.separatingLines')>
 
     |styleSheet|
 
     styleSheet := StyleSheet.
 
-    DefaultViewBackground := styleSheet colorAt:'pullDownMenuViewBackground'.
+    DefaultViewBackground := styleSheet colorAt:'pullDownMenu.viewBackground'.
     DefaultViewBackground isNil ifTrue:[
-        DefaultViewBackground := styleSheet colorAt:'menuViewBackground'.
+        DefaultViewBackground := styleSheet colorAt:'menuView.background'.
     ].
-    DefaultForegroundColor := styleSheet colorAt:'pullDownMenuForegroundColor'.
+    DefaultForegroundColor := styleSheet colorAt:'pullDownMenu.foregroundColor'.
     DefaultForegroundColor isNil ifTrue:[
-        DefaultForegroundColor := styleSheet colorAt:'menuForegroundColor'.
+        DefaultForegroundColor := styleSheet colorAt:'menu.foregroundColor'.
     ].
-    DefaultBackgroundColor := styleSheet colorAt:'pullDownMenuBackgroundColor'.
+    DefaultBackgroundColor := styleSheet colorAt:'pullDownMenu.backgroundColor'.
     DefaultBackgroundColor isNil ifTrue:[
         DefaultViewBackground notNil ifTrue:[
             DefaultBackgroundColor := DefaultViewBackground
         ] ifFalse:[
-            DefaultBackgroundColor := styleSheet colorAt:'menuBackgroundColor'.
+            DefaultBackgroundColor := styleSheet colorAt:'menu.backgroundColor'.
         ]
     ].
-    DefaultHilightForegroundColor := styleSheet colorAt:'pullDownMenuHilightForegroundColor'.
+    DefaultHilightForegroundColor := styleSheet colorAt:'pullDownMenu.hilightForegroundColor'.
     DefaultHilightForegroundColor isNil ifTrue:[
-        DefaultHilightForegroundColor := styleSheet colorAt:'menuHilightForegroundColor'.
+        DefaultHilightForegroundColor := styleSheet colorAt:'menu.hilightForegroundColor'.
     ].
-    DefaultHilightBackgroundColor := styleSheet colorAt:'pullDownMenuHilightBackgroundColor'.
+    DefaultHilightBackgroundColor := styleSheet colorAt:'pullDownMenu.hilightBackgroundColor'.
     DefaultHilightBackgroundColor isNil ifTrue:[
-        DefaultHilightBackgroundColor := styleSheet colorAt:'menuHilightBackgroundColor'.
+        DefaultHilightBackgroundColor := styleSheet colorAt:'menu.hilightBackgroundColor'.
     ].
-    DefaultHilightLevel := styleSheet at:'pullDownMenuHilightLevel'.
+    DefaultHilightLevel := styleSheet at:'pullDownMenu.hilightLevel'.
     DefaultHilightLevel isNil ifTrue:[
-        DefaultHilightLevel := styleSheet at:'menuHilightLevel' default:0.
+        DefaultHilightLevel := styleSheet at:'menu.hilightLevel' default:0.
     ].
-    DefaultEdgeStyle := styleSheet at:'pullDownMenuEdgeStyle'.
-    DefaultKeepMenu := styleSheet at:'pullDownMenuKeepMenu' default:false.
-    DefaultToggleKeep := styleSheet at:'pullDownMenuToggleKeep' default:false.
-    DefaultLevel := styleSheet at:'pullDownMenuLevel' default:1.
-    DefaultFont := styleSheet fontAt:'pullDownMenuFont'.
-    DefaultFont isNil ifTrue:[DefaultFont := styleSheet fontAt:'menuFont'].
-    DefaultSeparatingLines := styleSheet at:'pullDownMenuSeparatingLines' default:false.
+    DefaultEdgeStyle := styleSheet at:'pullDownMenu.edgeStyle'.
+    DefaultKeepMenu := styleSheet at:'pullDownMenu.keepMenu' default:false.
+    DefaultToggleKeep := styleSheet at:'pullDownMenu.toggleKeep' default:false.
+    DefaultLevel := styleSheet at:'pullDownMenu.level' default:1.
+    DefaultFont := styleSheet fontAt:'pullDownMenu.font'.
+    DefaultFont isNil ifTrue:[DefaultFont := styleSheet fontAt:'menu.font'].
+    DefaultSeparatingLines := styleSheet at:'pullDownMenu.separatingLines' default:false.
 
     "
      PullDownMenu updateStyleCache
     "
 
-    "Modified: 1.3.1996 / 13:45:19 / cg"
+    "Modified: 20.10.1997 / 14:02:28 / cg"
 ! !
 
 !PullDownMenu methodsFor:'accessing'!
@@ -1741,5 +1743,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.77 1997-07-25 14:21:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.78 1997-10-21 18:15:06 cg Exp $'
 ! !
--- a/ScrView.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/ScrView.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/Attic/ScrView.st,v 1.72 1997-10-11 15:56:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.73 1997-10-21 18:12:28 cg Exp $'
 ! !
--- 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 $'
 ! !
--- a/Scroller.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/Scroller.st	Tue Oct 21 20:15:06 1997 +0200
@@ -10,7 +10,7 @@
  hereby transferred.
 "
 
-'From Smalltalk/X, Version:3.2.1 on 14-oct-1997 at 11:24:04 pm'                 !
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:10:53 pm'                  !
 
 View subclass:#Scroller
 	instanceVariableNames:'thumbOrigin thumbHeight thumbColor thumbFrameColor scrollAction
@@ -1975,5 +1975,5 @@
 !Scroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.91 1997-10-15 11:26:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.92 1997-10-21 18:14:35 cg Exp $'
 ! !
--- a/SelListV.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/SelListV.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 2:11:13 pm'                  !
+
 ListView subclass:#SelectionInListView
 	instanceVariableNames:'selection actionBlock enabled hilightFgColor hilightBgColor
 		halfIntensityFgColor doubleClickActionBlock selectConditionBlock
@@ -1000,34 +1002,34 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#selectionDisabledForegroundColor
-                       #selectionHilightForegroundColor #selectionHilightBackgroundColor
-                       #selectionHilightFrameColor #selectionHilightLevel
-                       #selectionRightArrowStyle #selectionRightArrowLevel
-                       #selectionForegroundColor #selectionBackgroundColor
-                       #selectionShadowColor #selectionLightColor
-                       #selectionFont #selectionHilightStyle)>
-
-    DefaultDisabledForegroundColor := StyleSheet colorAt:'selectionDisabledForegroundColor'.
-    DefaultHilightForegroundColor := StyleSheet colorAt:'selectionHilightForegroundColor'.
-    DefaultHilightBackgroundColor := StyleSheet colorAt:'selectionHilightBackgroundColor'.
-    DefaultHilightFrameColor := StyleSheet colorAt:'selectionHilightFrameColor'.
-    DefaultHilightLevel := StyleSheet at:'selectionHilightLevel' default:0.
-    DefaultHilightStyle := StyleSheet at:'selectionHilightStyle' default:(StyleSheet name).
-    DefaultRightArrowStyle := StyleSheet at:'selectionRightArrowStyle'.
-    DefaultRightArrowLevel := StyleSheet at:'selectionRightArrowLevel'.
-    DefaultForegroundColor := StyleSheet colorAt:'selectionForegroundColor'.
-    DefaultBackgroundColor := StyleSheet colorAt:'selectionBackgroundColor'.
-    DefaultShadowColor := StyleSheet colorAt:'selectionShadowColor'.
-    DefaultLightColor := StyleSheet colorAt:'selectionLightColor'.
-    DefaultFont := StyleSheet fontAt:'selectionFont'.
+    <resource: #style (#'selection.disabledForegroundColor'
+                       #'selection.hilightForegroundColor' #'selection.hilightBackgroundColor'
+                       #'selection.hilightFrameColor' #'selection.hilightLevel'
+                       #'selection.rightArrowStyle' #'selection.rightArrowLevel'
+                       #'selection.foregroundColor' #'selection.backgroundColor'
+                       #'selection.shadowColor' #'selection.lightColor'
+                       #'selection.font' #'selection.hilightStyle')>
+
+    DefaultDisabledForegroundColor := StyleSheet colorAt:'selection.disabledForegroundColor'.
+    DefaultHilightForegroundColor := StyleSheet colorAt:'selection.hilightForegroundColor'.
+    DefaultHilightBackgroundColor := StyleSheet colorAt:'selection.hilightBackgroundColor'.
+    DefaultHilightFrameColor := StyleSheet colorAt:'selection.hilightFrameColor'.
+    DefaultHilightLevel := StyleSheet at:'selection.hilightLevel' default:0.
+    DefaultHilightStyle := StyleSheet at:'selection.hilightStyle' default:(StyleSheet name).
+    DefaultRightArrowStyle := StyleSheet at:'selection.rightArrowStyle'.
+    DefaultRightArrowLevel := StyleSheet at:'selection.rightArrowLevel'.
+    DefaultForegroundColor := StyleSheet colorAt:'selection.foregroundColor'.
+    DefaultBackgroundColor := StyleSheet colorAt:'selection.backgroundColor'.
+    DefaultShadowColor := StyleSheet colorAt:'selection.shadowColor'.
+    DefaultLightColor := StyleSheet colorAt:'selection.lightColor'.
+    DefaultFont := StyleSheet fontAt:'selection.font'.
     RightArrowForm := nil.
 
     "
      self updateStyleCache
     "
 
-    "Modified: 21.3.1996 / 17:27:59 / cg"
+    "Modified: 20.10.1997 / 14:04:26 / cg"
 ! !
 
 !SelectionInListView methodsFor:'accessing-actions'!
@@ -3381,5 +3383,5 @@
 !SelectionInListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/SelListV.st,v 1.116 1997-10-15 10:30:50 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/SelListV.st,v 1.117 1997-10-21 18:14:13 cg Exp $'
 ! !
--- a/SelectionInListView.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/SelectionInListView.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 2:11:13 pm'                  !
+
 ListView subclass:#SelectionInListView
 	instanceVariableNames:'selection actionBlock enabled hilightFgColor hilightBgColor
 		halfIntensityFgColor doubleClickActionBlock selectConditionBlock
@@ -1000,34 +1002,34 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#selectionDisabledForegroundColor
-                       #selectionHilightForegroundColor #selectionHilightBackgroundColor
-                       #selectionHilightFrameColor #selectionHilightLevel
-                       #selectionRightArrowStyle #selectionRightArrowLevel
-                       #selectionForegroundColor #selectionBackgroundColor
-                       #selectionShadowColor #selectionLightColor
-                       #selectionFont #selectionHilightStyle)>
-
-    DefaultDisabledForegroundColor := StyleSheet colorAt:'selectionDisabledForegroundColor'.
-    DefaultHilightForegroundColor := StyleSheet colorAt:'selectionHilightForegroundColor'.
-    DefaultHilightBackgroundColor := StyleSheet colorAt:'selectionHilightBackgroundColor'.
-    DefaultHilightFrameColor := StyleSheet colorAt:'selectionHilightFrameColor'.
-    DefaultHilightLevel := StyleSheet at:'selectionHilightLevel' default:0.
-    DefaultHilightStyle := StyleSheet at:'selectionHilightStyle' default:(StyleSheet name).
-    DefaultRightArrowStyle := StyleSheet at:'selectionRightArrowStyle'.
-    DefaultRightArrowLevel := StyleSheet at:'selectionRightArrowLevel'.
-    DefaultForegroundColor := StyleSheet colorAt:'selectionForegroundColor'.
-    DefaultBackgroundColor := StyleSheet colorAt:'selectionBackgroundColor'.
-    DefaultShadowColor := StyleSheet colorAt:'selectionShadowColor'.
-    DefaultLightColor := StyleSheet colorAt:'selectionLightColor'.
-    DefaultFont := StyleSheet fontAt:'selectionFont'.
+    <resource: #style (#'selection.disabledForegroundColor'
+                       #'selection.hilightForegroundColor' #'selection.hilightBackgroundColor'
+                       #'selection.hilightFrameColor' #'selection.hilightLevel'
+                       #'selection.rightArrowStyle' #'selection.rightArrowLevel'
+                       #'selection.foregroundColor' #'selection.backgroundColor'
+                       #'selection.shadowColor' #'selection.lightColor'
+                       #'selection.font' #'selection.hilightStyle')>
+
+    DefaultDisabledForegroundColor := StyleSheet colorAt:'selection.disabledForegroundColor'.
+    DefaultHilightForegroundColor := StyleSheet colorAt:'selection.hilightForegroundColor'.
+    DefaultHilightBackgroundColor := StyleSheet colorAt:'selection.hilightBackgroundColor'.
+    DefaultHilightFrameColor := StyleSheet colorAt:'selection.hilightFrameColor'.
+    DefaultHilightLevel := StyleSheet at:'selection.hilightLevel' default:0.
+    DefaultHilightStyle := StyleSheet at:'selection.hilightStyle' default:(StyleSheet name).
+    DefaultRightArrowStyle := StyleSheet at:'selection.rightArrowStyle'.
+    DefaultRightArrowLevel := StyleSheet at:'selection.rightArrowLevel'.
+    DefaultForegroundColor := StyleSheet colorAt:'selection.foregroundColor'.
+    DefaultBackgroundColor := StyleSheet colorAt:'selection.backgroundColor'.
+    DefaultShadowColor := StyleSheet colorAt:'selection.shadowColor'.
+    DefaultLightColor := StyleSheet colorAt:'selection.lightColor'.
+    DefaultFont := StyleSheet fontAt:'selection.font'.
     RightArrowForm := nil.
 
     "
      self updateStyleCache
     "
 
-    "Modified: 21.3.1996 / 17:27:59 / cg"
+    "Modified: 20.10.1997 / 14:04:26 / cg"
 ! !
 
 !SelectionInListView methodsFor:'accessing-actions'!
@@ -3381,5 +3383,5 @@
 !SelectionInListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.116 1997-10-15 10:30:50 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.117 1997-10-21 18:14:13 cg Exp $'
 ! !
--- a/Workspace.st	Tue Oct 21 20:03:18 1997 +0200
+++ b/Workspace.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 2:11:55 pm'                  !
+
 TextCollector subclass:#Workspace
 	instanceVariableNames:'doItAction codeStartPosition errorFgColor errorBgColor'
 	classVariableNames:'DefaultErrorForegroundColor DefaultErrorBackgroundColor'
@@ -89,13 +91,13 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#codeErrorSelectionForegroundColor
-                       #codeErrorSelectionBackgroundColor)>
+    <resource: #style (#'codeErrorSelection.foregroundColor'
+                       #'codeErrorSelection.backgroundColor')>
 
-    DefaultErrorForegroundColor := StyleSheet colorAt:'codeErrorSelectionForegroundColor'.
-    DefaultErrorBackgroundColor := StyleSheet colorAt:'codeErrorSelectionBackgroundColor'.
+    DefaultErrorForegroundColor := StyleSheet colorAt:'codeErrorSelection.foregroundColor'.
+    DefaultErrorBackgroundColor := StyleSheet colorAt:'codeErrorSelection.backgroundColor'.
 
-    "Modified: 1.3.1996 / 13:52:04 / cg"
+    "Modified: 20.10.1997 / 14:06:18 / cg"
 ! !
 
 !Workspace class methodsFor:'getting a System Workspace'!
@@ -612,5 +614,5 @@
 !Workspace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.55 1997-07-03 12:29:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.56 1997-10-21 18:14:11 cg Exp $'
 ! !
hg/stx-libwidg