PopUpView.st
changeset 5416 60f9d36d0a27
parent 5387 be2ff936d043
child 6086 1f43f897be4c
--- a/PopUpView.st	Sat Oct 24 15:59:54 2009 +0200
+++ b/PopUpView.st	Sat Oct 24 16:02:17 2009 +0200
@@ -109,7 +109,7 @@
     ].
     DefaultLevel := StyleSheet at:'popup.level'.
     DefaultBorderWidth := StyleSheet at:'popup.borderWidth'.
-    DefaultBorderColor := StyleSheet colorAt:'popup.borderColor'.
+    DefaultBorderColor := StyleSheet colorAt:'popup.borderColor' default:Color black.
 
     "Modified: 20.10.1997 / 15:10:07 / cg"
 ! !
@@ -274,18 +274,18 @@
 initStyle
     "setup viewStyle specifics"
 
-    |l|
+    |l bw|
 
     super initStyle.
 
     DefaultBorderColor notNil ifTrue:[
         self borderColor:(DefaultBorderColor onDevice:device).
     ].
-    DefaultBorderWidth isNil ifTrue:[
-        self setBorderWidth:(styleSheet is3D ifTrue:[0] ifFalse:[1]).
-    ] ifFalse:[
-        self setBorderWidth:DefaultBorderWidth.
+    (bw := DefaultBorderWidth) isNil ifTrue:[
+        bw := (styleSheet is3D ifTrue:[0] ifFalse:[1]).
     ].
+    self borderWidth:bw.
+
     DefaultLevel isNil ifTrue:[
         l := styleSheet is3D ifTrue:[1] ifFalse:[0].
     ] ifFalse:[
@@ -460,9 +460,9 @@
 !PopUpView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.58 2009-10-23 15:20:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.59 2009-10-24 14:02:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.58 2009-10-23 15:20:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/PopUpView.st,v 1.59 2009-10-24 14:02:17 cg Exp $'
 ! !