--- a/Cursor.st	Mon Jan 13 20:14:51 1997 +0100
+++ b/Cursor.st	Mon Jan 13 20:15:45 1997 +0100
@@ -1685,7 +1685,13 @@
 show
     "ST-80 mimicri: change cursors in active groups views to the receiver."
 
-    WindowGroup activeGroup showCursor:self
+    |wg|
+
+    (wg := WindowGroup activeGroup) notNil ifTrue:[
+        wg showCursor:self
+    ]
+
+    "Modified: 13.1.1997 / 20:10:01 / cg"
 !
 
 showIn:aView 
@@ -1709,15 +1715,15 @@
     "ST-80 mimicri: change all views cursors to the receiver.
      Return the value as returned by aBlock."
 
-    ^ WindowGroup activeGroup withCursor:self do:aBlock
+    |wg|
 
-"/    |v|
-"/
-"/    Display setCursors:self.
-"/    v := aBlock valueNowOrOnUnwindDo:[
-"/        Display restoreCursors.
-"/    ].
-"/    ^ v
+    (wg := WindowGroup activeGroup) notNil ifTrue:[
+        ^ wg withCursor:self do:aBlock
+    ] ifFalse:[
+        aBlock value
+    ]
+
+    "Modified: 13.1.1997 / 20:10:25 / cg"
 ! !
 
 !Cursor methodsFor:'accessing'!
@@ -1988,6 +1994,6 @@
 !Cursor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.42 1997-01-10 18:40:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.43 1997-01-13 19:15:45 cg Exp $'
 ! !
 Cursor initialize!