--- a/Cursor.st	Wed Oct 27 15:31:14 1999 +0200
+++ b/Cursor.st	Wed Oct 27 15:32:05 1999 +0200
@@ -391,9 +391,14 @@
 
     |device builtIn bits isWindows|
 
-    device := Display.
-    isWindows := device platformName = 'WIN32'.
-    builtIn := device builtInCursorShapes.
+    device := Display ? Screen current.
+    device isNil ifTrue:[
+	isWindows := false.
+	builtIn := #().
+    ] ifFalse:[
+        isWindows := device platformName = 'WIN32'.
+        builtIn := device builtInCursorShapes.
+    ].
 
     (builtIn includes:#folder) ifFalse:[
         FolderCursor :=   
@@ -1823,6 +1828,10 @@
     "return one of the standard cursors already associated to aDevice.
      This is the same as '(Cursor shape:aShape) on:aDevice' but somwehat faster."
 
+    aDevice isNil ifTrue:[
+        ^ self basicNew setShape:aShape
+    ].
+
     "first look if not already known"
 
     aDevice deviceCursors do:[:aCursor |
@@ -2875,5 +2884,5 @@
 !Cursor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.75 1999-10-26 17:52:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.76 1999-10-27 13:31:44 stefan Exp $'
 ! !