FileSelectionBox.st
changeset 130 338e856bddc9
parent 121 4e63bbdb266a
child 132 596439fe4efd
--- a/FileSelectionBox.st	Fri May 19 18:41:01 1995 +0200
+++ b/FileSelectionBox.st	Tue Jun 06 06:16:07 1995 +0200
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.16 1995-05-06 14:17:07 claus Exp $
+$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.17 1995-06-06 04:13:25 claus Exp $
 '!
 
 !FileSelectionBox class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.16 1995-05-06 14:17:07 claus Exp $
+$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.17 1995-06-06 04:13:25 claus Exp $
 "
 !
 
@@ -169,7 +169,7 @@
 	selectionList pattern:patternField contents. 
 	self updateList
     ].
-    patternField hidden:true. "delay showing, until a pattern is defined"
+    patternField hiddenOnRealize:true. "delay showing, until a pattern is defined"
 
     selectionList action:[:line |
 	|entry|
@@ -272,16 +272,16 @@
 
 !FileSelectionBox methodsFor:'queries'!
 
-preferedExtent
-    "return my prefered extent - thats the minimum size 
+preferredExtent
+    "return my preferred extent - thats the minimum size 
      to make everything visible"
 
     |wWanted hWanted|
 
     wWanted := ViewSpacing + 
-	       labelField preferedExtent x + 
+	       labelField preferredExtent x + 
 	       (ViewSpacing * 2) + 
-	       patternField preferedExtent x + 
+	       patternField preferredExtent x + 
 	       ViewSpacing.
     (wWanted < width) ifTrue:[
 	wWanted := width
@@ -289,7 +289,7 @@
     hWanted := ViewSpacing + labelField height +
 	       ViewSpacing + enterField height +
 	       ViewSpacing + selectionList height +
-	       ViewSpacing + buttonPanel preferedExtent y +
+	       ViewSpacing + buttonPanel preferredExtent y +
 	       ViewSpacing.
 
     (hWanted < height) ifTrue:[
@@ -318,33 +318,36 @@
     "set the pattern - this also enables the PatternField
      (if the pattern is non-nil) or hides it (if nil)."
 
+    |hidePatternField focusSequence|
+
     patternField initialText:aPattern.
     selectionList pattern:aPattern.
     aPattern isNil ifTrue:[
-	patternField hidden:true.
+	hidePatternField := true.
 	realized ifTrue:[
 	    patternField hide.
 	].
-	windowGroup notNil ifTrue:[
-	    windowGroup focusSequence:(Array 
-					with:enterField 
-					with:selectionList 
-					with:okButton 
-					with:abortButton)
-	]
+	focusSequence := (Array 
+			     with:enterField 
+			     with:selectionList 
+			     with:okButton 
+			     with:abortButton)
     ] ifFalse:[
-	patternField hidden:false.
+	hidePatternField := false.
 	realized ifTrue:[
 	    patternField realize.
 	].
-	windowGroup notNil ifTrue:[
-	    windowGroup focusSequence:(Array 
-					with:patternField 
-					with:enterField 
-					with:selectionList 
-					with:okButton 
-					with:abortButton)
-	]
+	focusSequence := (Array 
+			     with:patternField 
+			     with:enterField 
+			     with:selectionList 
+			     with:okButton 
+			     with:abortButton)
+    ].
+
+    patternField hiddenOnRealize:hidePatternField.
+    windowGroup notNil ifTrue:[
+	windowGroup focusSequence:focusSequence
     ].
 !