*** empty log message ***
authorclaus
Thu, 09 Mar 1995 03:11:38 +0100
changeset 101 88e7faeda854
parent 100 25778412f2b0
child 102 f600526404e6
*** empty log message ***
EnterBox.st
FSelBox.st
FileSelectionBox.st
FontPanel.st
--- a/EnterBox.st	Mon Mar 06 22:23:47 1995 +0100
+++ b/EnterBox.st	Thu Mar 09 03:11:38 1995 +0100
@@ -37,7 +37,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.16 1995-03-06 19:28:30 claus Exp $
+$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.17 1995-03-09 02:11:17 claus Exp $
 "
 !
 
@@ -143,20 +143,25 @@
     ^ self new title:titleString
 !
 
+title:titleString action:aBlock
+    "create and return a new EnterBox with title aString,
+     which will evaluate aBlock when 'ok' is pressed"
+
+    ^ (self title:titleString) action:aBlock
+!
+
+title:titleString okText:okText action:aBlock
+    "create and return a new EnterBox with title aString, and ok button showing
+     okText; it will evaluate aBlock when 'ok' is pressed"
+
+    ^ (self title:titleString action:aBlock) okText:okText
+!
+
 title:titleString okText:okText abortText:abortText action:aBlock
     "create and return a new EnterBox with title aString, and buttons showing
      okText and abortText; it will evaluate aBlock when 'ok' is pressed"
 
-    ^ ((self new) title:titleString 
-		 okText:okText 
-	      abortText:abortText) action:aBlock
-!
-
-title:titleString action:aBlock
-    "create and return a new EnterBox with title aString,
-     which will evaluate aBlock when 'ok' is pressed"
-
-    ^ ((self new) title:titleString) action:aBlock
+    ^ (self title:titleString okText:okText action:aBlock) abortText:abortText 
 ! !
 
 !EnterBox class methodsFor:'defaults'!
--- a/FSelBox.st	Mon Mar 06 22:23:47 1995 +0100
+++ b/FSelBox.st	Thu Mar 09 03:11:38 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.12 1995-02-06 00:52:18 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.13 1995-03-09 02:11:31 claus Exp $
 '!
 
 !FileSelectionBox class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.12 1995-02-06 00:52:18 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.13 1995-03-09 02:11:31 claus Exp $
 "
 !
 
@@ -146,6 +146,8 @@
 !FileSelectionBox methodsFor:'initialization'!
 
 initialize
+    |corner|
+
     super initialize.
 
     label := 'File dialog'.
@@ -156,14 +158,11 @@
 
     patternField := EditField in:self.
     self is3D ifTrue:[
-	patternField 
-	    origin:(0.7 @ labelField origin y)
-	    corner:(1.0 @ (labelField origin y+patternField heightIncludingBorder)).
+	corner := (1.0 @ (labelField origin y+patternField heightIncludingBorder)).
     ] ifFalse:[
-	patternField
-	    origin:(0.7 @ labelField origin y)
-	    corner:[(width - ViewSpacing - (patternField borderWidth * 2)) @ (labelField origin y+patternField height"IncludingBorder")].
+	corner := [(width - ViewSpacing - (patternField borderWidth * 2)) @ (labelField origin y+patternField height"IncludingBorder")].
     ].
+    patternField origin:(0.7 @ labelField origin y) corner:corner.
     patternField rightInset:(ViewSpacing // 2).
     patternField initialText:'*'.
     patternField leaveAction:[:reason | 
@@ -217,11 +216,7 @@
 	    with:abortButton
 	    with:okButton 
     ].
-    ^ Array 
-	    with:enterField 
-	    with:selectionList 
-	    with:abortButton
-	    with:okButton 
+    ^ super focusSequence
 ! !
 
 !FileSelectionBox methodsFor:'dependencies'!
--- a/FileSelectionBox.st	Mon Mar 06 22:23:47 1995 +0100
+++ b/FileSelectionBox.st	Thu Mar 09 03:11:38 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1990 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.12 1995-02-06 00:52:18 claus Exp $
+$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.13 1995-03-09 02:11:31 claus Exp $
 '!
 
 !FileSelectionBox class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.12 1995-02-06 00:52:18 claus Exp $
+$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.13 1995-03-09 02:11:31 claus Exp $
 "
 !
 
@@ -146,6 +146,8 @@
 !FileSelectionBox methodsFor:'initialization'!
 
 initialize
+    |corner|
+
     super initialize.
 
     label := 'File dialog'.
@@ -156,14 +158,11 @@
 
     patternField := EditField in:self.
     self is3D ifTrue:[
-	patternField 
-	    origin:(0.7 @ labelField origin y)
-	    corner:(1.0 @ (labelField origin y+patternField heightIncludingBorder)).
+	corner := (1.0 @ (labelField origin y+patternField heightIncludingBorder)).
     ] ifFalse:[
-	patternField
-	    origin:(0.7 @ labelField origin y)
-	    corner:[(width - ViewSpacing - (patternField borderWidth * 2)) @ (labelField origin y+patternField height"IncludingBorder")].
+	corner := [(width - ViewSpacing - (patternField borderWidth * 2)) @ (labelField origin y+patternField height"IncludingBorder")].
     ].
+    patternField origin:(0.7 @ labelField origin y) corner:corner.
     patternField rightInset:(ViewSpacing // 2).
     patternField initialText:'*'.
     patternField leaveAction:[:reason | 
@@ -217,11 +216,7 @@
 	    with:abortButton
 	    with:okButton 
     ].
-    ^ Array 
-	    with:enterField 
-	    with:selectionList 
-	    with:abortButton
-	    with:okButton 
+    ^ super focusSequence
 ! !
 
 !FileSelectionBox methodsFor:'dependencies'!
--- a/FontPanel.st	Mon Mar 06 22:23:47 1995 +0100
+++ b/FontPanel.st	Thu Mar 09 03:11:38 1995 +0100
@@ -27,7 +27,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.7 1995-02-06 00:52:23 claus Exp $
+$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.8 1995-03-09 02:11:38 claus Exp $
 "
 !
 
@@ -125,6 +125,12 @@
     okAction := aBlock
 ! !
 
+!FontPanel methodsFor:'queries'!
+
+preferedExtent
+    ^ 400@350
+! !
+
 !FontPanel methodsFor:'initialization'!
 
 realize
@@ -341,4 +347,3 @@
     ].
     self showPreview
 ! !
-