--- a/ArrowButton.st	Thu Aug 28 11:42:21 2003 +0200
+++ b/ArrowButton.st	Thu Aug 28 17:21:00 2003 +0200
@@ -455,8 +455,13 @@
     ].
 
     form := self classVarAt:formVariableName.
-    (form notNil and:[form device == aDevice]) ifTrue:[
-        ^ form
+    form notNil ifTrue:[
+        form == #nil ifTrue:[
+            ^ nil
+        ].
+        form device == aDevice ifTrue:[
+            ^ form
+        ].
     ].
 
     form := self styleSheet at:styleSheetName default:nil.
@@ -485,7 +490,7 @@
      remember form for next use
     "
     CachedStyle := styleSymbol.
-    self classVarAt:formVariableName put:form.
+    self classVarAt:formVariableName put:(form ? #nil).
 
     ^ form
 
@@ -1044,5 +1049,5 @@
 !ArrowButton class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.67 2003-08-18 17:13:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.68 2003-08-28 15:21:00 cg Exp $'
 ! !