--- a/DialogBox.st	Sat Mar 06 03:08:19 1999 +0100
+++ b/DialogBox.st	Sat Mar 06 03:14:43 1999 +0100
@@ -3725,6 +3725,12 @@
 
 !DialogBox methodsFor:'construction-buttons'!
 
+addAbortAndOkButtons
+    "create both abort- and Ok Buttons"
+
+    self addAbortButton; addOkButton
+!
+
 addAbortButton
     "create an abortButton - to be sent from redefined initialize
      methods in subclasses or when creating a box programmatically.
@@ -3740,7 +3746,12 @@
 
     abortButton := aButton.
     aButton model:self; change:#abortPressed.
-    ^ self addButton:aButton.
+    (styleSheet at:'dialogBox.okAtLeft') ifTrue:[
+        self addButton:aButton after:nil.
+    ] ifFalse:[
+        self addButton:aButton before:nil.
+    ].
+    ^ aButton.
 
     "Created: 17.9.1995 / 20:17:26 / claus"
 !
@@ -3979,7 +3990,7 @@
      methods in subclasses or when creating a box programmatically.
      Returns the button."
 
-    okButton := aButton.
+    okButton isNil ifTrue:[okButton := aButton].
     aButton model:self; change:#okPressed.
     (styleSheet at:'dialogBox.okAtLeft') ifTrue:[
         self addButton:aButton before:nil.
@@ -5905,6 +5916,6 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.129 1999-03-06 01:58:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.130 1999-03-06 02:14:43 cg Exp $'
 ! !
 DialogBox initialize!

--- a/EnterBox.st	Sat Mar 06 03:08:19 1999 +0100
+++ b/EnterBox.st	Sat Mar 06 03:14:43 1999 +0100
@@ -464,7 +464,7 @@
 
     super initialize.
 
-    self addAbortButton; addOkButton.
+    self addAbortAndOkButtons.
 
     trimBlanks := true.
     label := resources string:'Enter'.
@@ -665,5 +665,5 @@
 !EnterBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.47 1998-07-27 18:19:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.48 1999-03-06 02:14:32 cg Exp $'
 ! !

--- a/FontPanel.st	Sat Mar 06 03:08:19 1999 +0100
+++ b/FontPanel.st	Sat Mar 06 03:14:43 1999 +0100
@@ -286,8 +286,7 @@
 
     mm := ViewSpacing.
 
-    self addAbortButton.
-    self addOkButton.
+    self addAbortAndOkButtons.
 
     panel := View origin:0.0@0.0 corner:1.0@1.0 in:self.
     panel bottomInset:(buttonPanel preferredExtent y + (mm*3)).
@@ -641,5 +640,5 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.43 1997-08-11 11:59:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.44 1999-03-06 02:14:14 cg Exp $'
 ! !