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.
.
authorclaus
Wed, 10 May 1995 04:30:46 +0200
changeset 126 40228f4fd66b
parent 125 3ffa271732f7
child 127 462396b08e30
.
ButtonC.st file | annotate | diff | comparison | revisions
ButtonController.st file | annotate | diff | comparison | revisions
DialogBox.st file | annotate | diff | comparison | revisions
EFGroup.st file | annotate | diff | comparison | revisions
EnterFieldGroup.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
MenuView.st file | annotate | diff | comparison | revisions
PopUpList.st file | annotate | diff | comparison | revisions
PopUpMenu.st file | annotate | diff | comparison | revisions
RButtC.st file | annotate | diff | comparison | revisions
RadioButtonController.st file | annotate | diff | comparison | revisions
TextView.st file | annotate | diff | comparison | revisions
ToggleC.st file | annotate | diff | comparison | revisions
ToggleController.st file | annotate | diff | comparison | revisions
VarHPanelC.st file | annotate | diff | comparison | revisions
VarPanelC.st file | annotate | diff | comparison | revisions
VarVPanelC.st file | annotate | diff | comparison | revisions
VariableHorizontalPanelController.st file | annotate | diff | comparison | revisions
VariablePanelController.st file | annotate | diff | comparison | revisions
VariableVerticalPanelController.st file | annotate | diff | comparison | revisions 
--- a/ButtonC.st	Tue May 09 03:57:16 1995 +0200
+++ b/ButtonC.st	Wed May 10 04:30:46 1995 +0200
@@ -18,7 +18,7 @@
 		releaseActionBlock isToggle'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !ButtonController class methodsFor:'documentation'!
@@ -39,7 +39,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.8 1995-05-09 01:54:58 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.9 1995-05-10 02:29:13 claus Exp $
 "
 !
 
--- a/ButtonController.st	Tue May 09 03:57:16 1995 +0200
+++ b/ButtonController.st	Wed May 10 04:30:46 1995 +0200
@@ -18,7 +18,7 @@
 		releaseActionBlock isToggle'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !ButtonController class methodsFor:'documentation'!
@@ -39,7 +39,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.8 1995-05-09 01:54:58 claus Exp $
+$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.9 1995-05-10 02:29:13 claus Exp $
 "
 !
 
--- a/DialogBox.st	Tue May 09 03:57:16 1995 +0200
+++ b/DialogBox.st	Wed May 10 04:30:46 1995 +0200
@@ -25,7 +25,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.12 1995-05-09 01:55:09 claus Exp $
+$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.13 1995-05-10 02:29:19 claus Exp $
 "
 !
 
@@ -493,6 +493,91 @@
 	    Transcript show:'value3: '; showCr:value3 value.
 	    Transcript show:'value4: '; showCr:value4 value.
 	]
+
+
+    a full example:
+
+	|box warnSTX allowUnderscore immutableArrays logDoits
+	 listOfLanguages listOfStyles styleNames 
+	 frame panel c resourceDir dir |
+
+	warnSTX := Compiler warnSTXSpecials asValue.
+	allowUnderscore := Compiler allowUnderscoreInIdentifier asValue.
+	immutableArrays := Compiler arraysAreImmutable asValue.
+
+	logDoits := Smalltalk logDoits asValue.
+
+	listOfLanguages := SelectionInList with:#('english'
+						  'german'
+						  'french'
+						  'spanish'
+						  'italian'
+						 ).
+	listOfLanguages selection:(Language asString).
+
+
+	resourceDir := Smalltalk getSystemFileName:'resources'.
+	dir := FileDirectory directoryNamed:resourceDir.
+
+	styleNames := dir select:[:aFileName | aFileName endsWith:'.style'].
+	styleNames := styleNames collect:[:aFileName | aFileName copyWithoutLast:6].
+	listOfStyles := SelectionInList with:styleNames.
+	listOfStyles selection:(View defaultStyle asString).
+
+	box := Dialog new.
+	box label:'Settings'.
+
+	frame := FramedBox label:'Compiler'.
+	panel := VerticalPanelView origin:0.0@0.0 corner:1.0@1.0 in:frame.
+	panel horizontalLayout:#leftSpace.
+
+	panel add:((CheckBox on:warnSTX) label:'warn about ST/X language extensions'; resize).
+	panel add:((CheckBox on:allowUnderscore) label:'allow underscore in identifiers'; resize).
+	panel add:((CheckBox on:immutableArrays) label:'literal arrays are immutable'; resize).
+	box addComponent:frame.
+
+	frame := FramedBox label:'Misc'.
+	panel := VerticalPanelView origin:0.0@0.0 corner:1.0@1.0 in:frame.
+	panel horizontalLayout:#leftSpace.
+
+	panel add:((CheckBox on:logDoits) label:'log doIts in changes file'; resize).
+	box addComponent:frame.
+
+	frame := FramedBox label:'Language'.
+	panel := VerticalPanelView origin:0.0@0.0 corner:1.0@1.0 in:frame.
+	panel horizontalLayout:#leftSpace.
+
+	panel add:(PopUpList on:listOfLanguages).
+	box addComponent:frame.
+
+	frame := FramedBox label:'Style'.
+	panel := VerticalPanelView origin:0.0@0.0 corner:1.0@1.0 in:frame.
+	panel horizontalLayout:#leftSpace.
+
+	panel add:(PopUpList on:listOfStyles).
+	box addComponent:frame.
+
+	box addAbortButton; addOkButton.
+	box showAtPointer.
+
+	box accepted ifTrue:[
+	    Transcript topView withCursor:Cursor wait do:[
+		Compiler warnSTXSpecials:warnSTX value.
+		Compiler allowUnderscoreInIdentifier:allowUnderscore value.
+		Compiler arraysAreImmutable:immutableArrays value.
+
+		Smalltalk logDoits:logDoits value.
+
+		Transcript showCr:'change language to ' , listOfLanguages selection , ' ...'.
+		Smalltalk at:#Language put:listOfLanguages selection asSymbol.
+		Smalltalk changed:#Language.
+		ResourcePack flushCachedResourcePacks.
+
+		Transcript showCr:'change style to ' , listOfStyles selection , ' ...'.
+		View defaultStyle:listOfStyles selection asSymbol.
+	    ]
+	]
+
 "
 !
 
--- a/EFGroup.st	Tue May 09 03:57:16 1995 +0200
+++ b/EFGroup.st	Wed May 10 04:30:46 1995 +0200
@@ -15,14 +15,14 @@
 				wrap'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Views-Support'
+	 category:'Interface-Support'
 !
 
 EnterFieldGroup comment:'
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.10 1995-05-09 01:55:13 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.11 1995-05-10 02:29:23 claus Exp $
 '!
 
 !EnterFieldGroup class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.10 1995-05-09 01:55:13 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.11 1995-05-10 02:29:23 claus Exp $
 "
 !
 
--- a/EnterFieldGroup.st	Tue May 09 03:57:16 1995 +0200
+++ b/EnterFieldGroup.st	Wed May 10 04:30:46 1995 +0200
@@ -15,14 +15,14 @@
 				wrap'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Views-Support'
+	 category:'Interface-Support'
 !
 
 EnterFieldGroup comment:'
 COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.10 1995-05-09 01:55:13 claus Exp $
+$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.11 1995-05-10 02:29:23 claus Exp $
 '!
 
 !EnterFieldGroup class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.10 1995-05-09 01:55:13 claus Exp $
+$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.11 1995-05-10 02:29:23 claus Exp $
 "
 !
 
--- a/Make.proto	Tue May 09 03:57:16 1995 +0200
+++ b/Make.proto	Wed May 10 04:30:46 1995 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libwidg/Make.proto,v 1.19 1995-05-07 00:16:56 claus Exp $
+# $Header: /cvs/stx/stx/libwidg/Make.proto,v 1.20 1995-05-10 02:30:46 claus Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -131,7 +131,7 @@
 PSEUDOVIEW=$(I)/PseudoV.H $(DEVDRAWABLE)
 SIMPLEVIEW=$(I)/SimpleView.H $(PSEUDOVIEW)
 VIEW=$(I)/View.H $(SIPLEVIEW)
-POPUPVIEW=$(I)/PopUpView.H $(VIEW)
+POPUPVIEW=$(I)/PopUpView.H $(I)/TopView.H $(VIEW)
 STDSYSVIEW=$(I)/StdSysV.H $(I)/TopView.H $(VIEW)
 LISTVIEW=$(I)/ListView.H $(VIEW)
 SELLISTVIEW=$(I)/SelListV.H $(LISTVIEW)
--- a/MenuView.st	Tue May 09 03:57:16 1995 +0200
+++ b/MenuView.st	Wed May 10 04:30:46 1995 +0200
@@ -33,7 +33,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.24 1995-05-03 00:36:19 claus Exp $
+$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.25 1995-05-10 02:29:46 claus Exp $
 '!
 
 !MenuView class methodsFor:'documentation'!
@@ -54,7 +54,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.24 1995-05-03 00:36:19 claus Exp $
+$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.25 1995-05-10 02:29:46 claus Exp $
 "
 !
 
@@ -151,7 +151,7 @@
     "OBSOLETE protocol: labels:selectors:args:receiver: knows how to handle a
      single symbol-arg for selectors ..."
 
-    ^ self labels:labels selectors:aSelector args:argArray receiver:anObject
+    ^ self labels:labels selectors:aSelector args:argArray receiver:anObject in:aTopMenu
 !
 
 labels:labels selectors:selArray args:argArray receiver:anObject for:aTopMenu
--- a/PopUpList.st	Tue May 09 03:57:16 1995 +0200
+++ b/PopUpList.st	Wed May 10 04:30:46 1995 +0200
@@ -10,10 +10,10 @@
  hereby transferred.
 "
 
-'From Smalltalk/X, Version:2.10.5 on 9-may-1995 at 12:04:16 pm'!
+'From Smalltalk/X, Version:2.10.5 on 9-may-1995 at 12:06:03 pm'!
 
 Button subclass:#PopUpList
-	 instanceVariableNames:'menu menuAction values useIndex listMsg initialSelectionMsg'
+	 instanceVariableNames:'menu menuAction values useIndex listMsg'
 	 classVariableNames:''
 	 poolDictionaries:''
 	 category:'Views-Interactors'
@@ -23,7 +23,7 @@
 COPYRIGHT (c) 1994 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.12 1995-05-09 01:56:26 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.13 1995-05-10 02:29:55 claus Exp $
 '!
 
 !PopUpList class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.12 1995-05-09 01:56:26 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.13 1995-05-10 02:29:55 claus Exp $
 "
 !
 
@@ -78,10 +78,6 @@
 
 	listMsg              <Symbol>   message to aquire a new list from the
 					model. Default is #list.
-
-
-	initialSelectionMsg  <Symbol>   message to aquire a new selection from the
-					model. Default is #selection.
 "
 !
 
@@ -140,15 +136,15 @@
      |p|
      p := PopUpList label:'dummy'.
      p list:#('apples' 'bananas' 'grape' 'lemon' 
-	      '=' 
-	      'margaritas' 'pina colada'
-	      '=' 
-	      'smalltalk' 'c++' 'eiffel').
+              '=' 
+              'margaritas' 'pina colada'
+              '=' 
+              'smalltalk' 'c++' 'eiffel').
      p values:#(apples bananas grape lemon 
-		nil 
-		'mhmh - so good' 'makes headache'
-		nil
-		'great' 'another headache' 'no bad').
+                nil 
+                'mhmh - so good' 'makes headache'
+                nil
+                'great' 'another headache' 'no bad').
      p selection:'apples'.
      p action:[:what | Transcript show:'you selected: '; showCr:what].
      p open
@@ -197,11 +193,13 @@
      model selection:'apples'.
 
      p := PopUpList on:model.
+     p useIndex:true; aspect:#selectionIndex; change:#selectionIndex:.
      p open.
 
      slv := SelectionInListView on:model.
      slv open.
 
+     p inspect.
      model selectionIndexHolder inspect
 
 
@@ -221,11 +219,11 @@
      panel horizontalLayout:#fitSpace.
 
      p := PopUpList label:'meals'.
-     p model:model; listMessage:#meals; change:#eat:.
+     p model:model; listMessage:#meals; aspect:nil; change:#eat:.
      panel add:p.
 
      p := PopUpList label:'drinks'.
-     p model:model; listMessage:#drinks; change:#drink:.
+     p model:model; listMessage:#drinks; aspect:nil; change:#drink:.
      panel add:p.
 
      top open
@@ -246,31 +244,13 @@
     ^ #selection:
 ! !
 
-!PopUpList methodsFor:'drawing'!
-
-drawWith:fgColor and:bgColor
-    |mmH mmV mW mH|
-
-    controller pressed ifTrue:[
-	super drawWith:enteredFgColor and:enteredBgColor
-    ] ifFalse:[
-	super drawWith:fgColor and:bgColor.
-    ].
-    mmH := device horizontalPixelPerMillimeter rounded.
-    mmV := device verticalPixelPerMillimeter rounded.
-    mW := (device horizontalPixelPerMillimeter * 2.5) rounded.
-    mH := (device verticalPixelPerMillimeter * 1.5) rounded.
-
-    self drawEdgesForX:(width - mW - (hSpace*2)) y:(height - mmV // 2)
-		 width:mW height:mH level:2
-! !
-
 !PopUpList methodsFor:'private'!
 
 realize
     super realize.
     model notNil ifTrue:[
-	self getListFromModel
+        self getListFromModel.
+        self getSelectionFromModel.
     ].
 !
 
@@ -308,15 +288,6 @@
     labelHeight := labelHeight max: (mmV * 2) rounded
 !
 
-getSelectionFromModel
-    "if I have a model and a listMsg, get my list from it"
-
-    (model notNil 
-    and:[aspectMsg notNil]) ifTrue:[
-	self selection:(model perform:aspectMsg).
-    ].
-!
-
 createMenuFor:aList
     menu := PopUpMenu
 		  labels:aList
@@ -324,15 +295,25 @@
 		    args:(1 to:aList size) 
 		receiver:self
 		     for:self.
-!
+! !
 
-getListFromModel
-    "if I have a model and a listMsg, get my list from it"
+!PopUpList methodsFor:'drawing'!
+
+drawWith:fgColor and:bgColor
+    |mmH mmV mW mH|
 
-    (model notNil 
-    and:[listMsg notNil]) ifTrue:[
-	self list:(model perform:listMsg).
+    controller pressed ifTrue:[
+	super drawWith:enteredFgColor and:enteredBgColor
+    ] ifFalse:[
+	super drawWith:fgColor and:bgColor.
     ].
+    mmH := device horizontalPixelPerMillimeter rounded.
+    mmV := device verticalPixelPerMillimeter rounded.
+    mW := (device horizontalPixelPerMillimeter * 2.5) rounded.
+    mH := (device verticalPixelPerMillimeter * 1.5) rounded.
+
+    self drawEdgesForX:(width - mW - (hSpace*2)) y:(height - mmV // 2)
+		 width:mW height:mH level:2
 ! !
 
 !PopUpList methodsFor:'event handling'!
@@ -469,6 +450,26 @@
      p action:[:val | Transcript showCr:'selected: ' , val printString].   
      p open.
     "
+! !
+
+!PopUpList methodsFor:'accessing-mvc'!
+
+getListFromModel
+    "if I have a model and a listMsg, get my list from it"
+
+    (model notNil 
+    and:[listMsg notNil]) ifTrue:[
+	self list:(model perform:listMsg).
+    ].
+!
+
+getSelectionFromModel
+    "if I have a model and an aspectMsg, get my current value from it"
+
+    (model notNil 
+    and:[aspectMsg notNil]) ifTrue:[
+	self selection:(model perform:aspectMsg).
+    ].
 !
 
 listMessage:aSelector
@@ -478,6 +479,13 @@
     listMsg := aSelector
 !
 
+addModelInterfaceTo:aDictionary
+    "see comment in View>>modelInterface"
+
+    super addModelInterfaceTo:aDictionary.
+    aDictionary at:#listMessage put:listMsg
+!
+
 listMessage
     "return the selector by which we ask the model for the list.
      Default is #list."
@@ -489,11 +497,12 @@
 
 initialize
     super initialize.
+
     controller beTriggerOnDown.
     controller action:[self popMenu].
     self adjust:#left.
     useIndex := false.
-
+    self label:'popup'.
     listMsg := self class defaultListMessage.
 
     onLevel := offLevel.
--- a/PopUpMenu.st	Tue May 09 03:57:16 1995 +0200
+++ b/PopUpMenu.st	Wed May 10 04:30:46 1995 +0200
@@ -23,7 +23,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.19 1995-05-03 16:30:04 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.20 1995-05-10 02:30:00 claus Exp $
 '!
 
 !PopUpMenu class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.19 1995-05-03 16:30:04 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.20 1995-05-10 02:30:00 claus Exp $
 "
 !
 
@@ -682,7 +682,7 @@
     ].
     self menu:(MenuView
 			labels:convertedLabels
-		      selector:nil
+		     selectors:nil
 			  args:argArray
 		      receiver:nil 
 			    in:self)
--- a/RButtC.st	Tue May 09 03:57:16 1995 +0200
+++ b/RButtC.st	Wed May 10 04:30:46 1995 +0200
@@ -4,7 +4,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !RadioButtonController methodsFor:'event handling'!
@@ -14,7 +14,7 @@
      buttons"
 
     pressed ifFalse:[
-        view toggle
+	view toggle
     ]
 ! !
 
--- a/RadioButtonController.st	Tue May 09 03:57:16 1995 +0200
+++ b/RadioButtonController.st	Wed May 10 04:30:46 1995 +0200
@@ -4,7 +4,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !RadioButtonController methodsFor:'event handling'!
@@ -14,7 +14,7 @@
      buttons"
 
     pressed ifFalse:[
-        view toggle
+	view toggle
     ]
 ! !
 
--- a/TextView.st	Tue May 09 03:57:16 1995 +0200
+++ b/TextView.st	Wed May 10 04:30:46 1995 +0200
@@ -34,7 +34,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.21 1995-05-06 14:17:58 claus Exp $
+$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.22 1995-05-10 02:30:19 claus Exp $
 '!
 
 !TextView class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.21 1995-05-06 14:17:58 claus Exp $
+$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.22 1995-05-10 02:30:19 claus Exp $
 "
 !
 
@@ -263,6 +263,20 @@
     listMsg notNil ifTrue:[
 	self getListFromModel
     ].
+!
+
+model:aModel
+    "when my model is set, and I am the menuPerformer/menuHolder,
+     reset holder to the model. This is a compatibility kludge,
+     since typically, ST-80 code expects the model to provide a menu
+     and the view to perform it.
+     Those apps which want the TextView to provide the menu have to reset
+     this by sending menuHolder: (again)"
+
+    super model:aModel.
+    (menuPerformer == self and:[menuHolder == self]) ifTrue:[
+	menuHolder := model
+    ]
 ! !
 
 !TextView methodsFor:'accessing'!
@@ -894,6 +908,24 @@
      Q: should we use one global searchBox for all textViews ?
 	(we could then preserve the last searchstring between views)
     "
+
+"/ "soon to come: search & replace box ...
+"/    |box|
+"/
+"/    box := Dialog new.
+"/    (box addTextLabel:(resources at:'searchPattern:')) layout:#left.
+"/    box addVerticalSpace.
+"/    box addInputFieldOn:'' asValue.
+"/    box addVerticalSpace.
+"/    (box addTextLabel:(resources at:'replace with:')) layout:#left.
+"/    box addVerticalSpace.
+"/    box addInputFieldOn:'' asValue.
+"/    box addAbortButtonLabelled:(resources at:'cancel');
+"/        addButton:(Button label:(resources at:'all'));
+"/        addButton:(Button label:(resources at:'prev'));
+"/        addOkButtonLabelled:(resources at:'next').
+"/    box open.
+
     searchBox isNil ifTrue:[
 	searchBox :=
 	    EnterBox2
@@ -901,8 +933,8 @@
 	     okText1:(resources at:'prev')
 	     okText2:(resources at:'next')
 	   abortText:(resources at:'cancel')
-	     action1:[:pattern | self searchBwd:(pattern withoutSeparators)]
-	     action2:[:pattern | self searchFwd:(pattern withoutSeparators)]
+	     action1:[:pattern | pattern notEmpty ifTrue:[self searchBwd:(pattern withoutSeparators)]]
+	     action2:[:pattern | pattern notEmpty ifTrue:[self searchFwd:(pattern withoutSeparators)]]
     ].
     searchPattern notNil ifTrue:[
 	searchBox initialText:searchPattern
--- a/ToggleC.st	Tue May 09 03:57:16 1995 +0200
+++ b/ToggleC.st	Wed May 10 04:30:46 1995 +0200
@@ -14,7 +14,7 @@
 	 instanceVariableNames:'action'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !ToggleController class methodsFor:'documentation'!
@@ -35,7 +35,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/ToggleC.st,v 1.5 1995-05-09 01:56:56 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ToggleC.st,v 1.6 1995-05-10 02:30:25 claus Exp $
 "
 !
 
--- a/ToggleController.st	Tue May 09 03:57:16 1995 +0200
+++ b/ToggleController.st	Wed May 10 04:30:46 1995 +0200
@@ -14,7 +14,7 @@
 	 instanceVariableNames:'action'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !ToggleController class methodsFor:'documentation'!
@@ -35,7 +35,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/ToggleController.st,v 1.5 1995-05-09 01:56:56 claus Exp $
+$Header: /cvs/stx/stx/libwidg/ToggleController.st,v 1.6 1995-05-10 02:30:25 claus Exp $
 "
 !
 
--- a/VarHPanelC.st	Tue May 09 03:57:16 1995 +0200
+++ b/VarHPanelC.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariableHorizontalPanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/VarHPanelC.st,v 1.2 1995-03-18 05:16:30 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/VarHPanelC.st,v 1.3 1995-05-10 02:30:32 claus Exp $
 "
 ! !
 
--- a/VarPanelC.st	Tue May 09 03:57:16 1995 +0200
+++ b/VarPanelC.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:'movedHandle prevPos startPos isHorizontal'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariablePanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/VarPanelC.st,v 1.1 1995-03-18 05:16:33 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/VarPanelC.st,v 1.2 1995-05-10 02:30:36 claus Exp $
 "
 ! !
 
--- a/VarVPanelC.st	Tue May 09 03:57:16 1995 +0200
+++ b/VarVPanelC.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariableVerticalPanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/VarVPanelC.st,v 1.2 1995-03-18 05:16:41 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/VarVPanelC.st,v 1.3 1995-05-10 02:30:40 claus Exp $
 "
 ! !
 
--- a/VariableHorizontalPanelController.st	Tue May 09 03:57:16 1995 +0200
+++ b/VariableHorizontalPanelController.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariableHorizontalPanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/VariableHorizontalPanelController.st,v 1.2 1995-03-18 05:16:30 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariableHorizontalPanelController.st,v 1.3 1995-05-10 02:30:32 claus Exp $
 "
 ! !
 
--- a/VariablePanelController.st	Tue May 09 03:57:16 1995 +0200
+++ b/VariablePanelController.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:'movedHandle prevPos startPos isHorizontal'
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariablePanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/VariablePanelController.st,v 1.1 1995-03-18 05:16:33 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariablePanelController.st,v 1.2 1995-05-10 02:30:36 claus Exp $
 "
 ! !
 
--- a/VariableVerticalPanelController.st	Tue May 09 03:57:16 1995 +0200
+++ b/VariableVerticalPanelController.st	Wed May 10 04:30:46 1995 +0200
@@ -16,7 +16,7 @@
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
-	 category:'Interface-Support'
+	 category:'Interface-Support-Controllers'
 !
 
 !VariableVerticalPanelController class methodsFor:'documentation'!
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/VariableVerticalPanelController.st,v 1.2 1995-03-18 05:16:41 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariableVerticalPanelController.st,v 1.3 1995-05-10 02:30:40 claus Exp $
 "
 ! !
hg/stx-libwidg