--- a/TextView.st	Thu Oct 16 16:44:11 1997 +0200
+++ b/TextView.st	Tue Oct 21 20:03:18 1997 +0200
@@ -10,7 +10,7 @@
  hereby transferred.
 "
 
-'From Smalltalk/X, Version:3.2.1 on 14-oct-1997 at 11:22:55 pm'                 !
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:11:29 pm'                  !
 
 ListView subclass:#TextView
 	instanceVariableNames:'selectionStartLine selectionStartCol selectionEndLine
@@ -205,20 +205,20 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#textViewBackground
-                       #textSelectionForegroundColor #textSelectionBackgroundColor
-                       #textViewFont #textWordSelectCatchesBlanks
+    <resource: #style (#'textView.background'
+                       #'textSelection.foregroundColor' #'textSelection.backgroundColor'
+                       #'textView.font' #textWordSelectCatchesBlanks
                        #st80Selections)>
 
-    DefaultViewBackground := StyleSheet colorAt:'textViewBackground' default:White.
-    DefaultSelectionForegroundColor := StyleSheet colorAt:'textSelectionForegroundColor'.
-    DefaultSelectionBackgroundColor := StyleSheet colorAt:'textSelectionBackgroundColor'.
-    DefaultFont := StyleSheet fontAt:'textViewFont'.
+    DefaultViewBackground := StyleSheet colorAt:'textView.background' default:White.
+    DefaultSelectionForegroundColor := StyleSheet colorAt:'textSelection.foregroundColor'.
+    DefaultSelectionBackgroundColor := StyleSheet colorAt:'textSelection.backgroundColor'.
+    DefaultFont := StyleSheet fontAt:'textView.font'.
     MatchDelayTime := 0.6.
     WordSelectCatchesBlanks := StyleSheet at:'textWordSelectCatchesBlanks' default:false.
     ST80Selections := StyleSheet at:'TextView.st80Selections' default:false.
 
-    "Modified: 11.9.1997 / 04:11:51 / cg"
+    "Modified: 20.10.1997 / 14:05:53 / cg"
 ! !
 
 !TextView class methodsFor:'startup'!
@@ -1980,9 +1980,15 @@
 searchBwd
     "search backward and -if found- position cursor"
 
+    |ign|
+
+    ign := lastSearchIgnoredCase ? false.
+
     self setSearchPattern.
     lastSearchPattern notNil ifTrue:[
-        self searchBwd:lastSearchPattern ignoreCase:lastSearchIgnoredCase
+        self 
+	    searchBwd:lastSearchPattern 
+	    ignoreCase:ign
     ]
 
     "Modified: 13.9.1997 / 06:24:35 / cg"
@@ -2227,6 +2233,10 @@
 searchFwd
     "search forward for pattern or selection"
 
+    |ign|
+
+    ign := lastSearchIgnoredCase ? false.
+
     selectStyle == #wordLeft ifTrue:[
         "
          remove the space from the selection
@@ -2237,7 +2247,9 @@
     ].
     self setSearchPattern.
     lastSearchPattern notNil ifTrue:[
-        self searchFwd:lastSearchPattern ignoreCase:lastSearchIgnoredCase
+        self 
+	    searchFwd:lastSearchPattern
+	    ignoreCase:ign
     ]
 
     "Modified: 13.9.1997 / 06:24:26 / cg"
@@ -2795,5 +2807,5 @@
 !TextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.108 1997-10-15 11:28:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.109 1997-10-21 18:03:14 cg Exp $'
 ! !

--- a/Toggle.st	Thu Oct 16 16:44:11 1997 +0200
+++ b/Toggle.st	Tue Oct 21 20:03:18 1997 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 3:15:58 pm'                  !
+
 Button subclass:#Toggle
 	instanceVariableNames:'showLamp lampColor lampWidth lampHeight'
 	classVariableNames:'DefaultShowLamp DefaultLampColor'
@@ -362,13 +364,13 @@
 updateStyleCache
     "extract values from the styleSheet and cache them in class variables"
 
-    <resource: #style (#toggleShowLamp
-                       #toggleLampColor)>
+    <resource: #style (#'toggle.showLamp'
+                       #'toggle.lampColor')>
 
-    DefaultShowLamp := StyleSheet at:'toggleShowLamp' default:false.
-    DefaultLampColor := StyleSheet colorAt:'toggleLampColor' default:Color yellow.
+    DefaultShowLamp := StyleSheet at:'toggle.showLamp' default:false.
+    DefaultLampColor := StyleSheet colorAt:'toggle.lampColor' default:Color yellow.
 
-    "Modified: 1.3.1996 / 13:50:30 / cg"
+    "Modified: 20.10.1997 / 15:15:35 / cg"
 ! !
 
 !Toggle methodsFor:'accessing-look'!
@@ -498,7 +500,7 @@
 	] ifFalse:[
 	    val := model perform:aspectMsg with:self
 	].
-	val ifTrue:[
+	val == true ifTrue:[  "allowing nil - treat as false"
 	    self turnOn
 	] ifFalse:[
 	    self turnOff
@@ -562,5 +564,5 @@
 !Toggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.37 1997-02-28 18:54:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.38 1997-10-21 18:03:18 cg Exp $'
 ! !