--- a/Cursor.st	Fri Jul 05 18:01:22 1996 +0200
+++ b/Cursor.st	Fri Jul 05 18:09:14 1996 +0200
@@ -22,7 +22,7 @@
 	category:'Graphics-Support'
 !
 
-!Cursor class methodsFor:'documentation'!
+!Cursor  class methodsFor:'documentation'!
 
 copyright
 "
@@ -223,7 +223,7 @@
 "
 ! !
 
-!Cursor class methodsFor:'initialization'!
+!Cursor  class methodsFor:'initialization'!
 
 flushDeviceCursors
     "unassign all cursors from their device"
@@ -255,7 +255,7 @@
     "Created: 15.6.1996 / 15:18:47 / cg"
 ! !
 
-!Cursor class methodsFor:'instance creation'!
+!Cursor  class methodsFor:'instance creation'!
 
 extent:extent fromArray:array offset:offset
     "create a new bitmap cursor from bits in the array argument
@@ -394,23 +394,25 @@
 
     "first look if not already known"
     Lobby isNil ifTrue:[
-	self initialize
+        self initialize
     ].
     Lobby do:[:aCursor |
-	(aCursor shape == aShape) ifTrue:[
-	    (aCursor device == aDevice) ifTrue:[^ aCursor].
-	    oldCursor := aCursor
-	].
+        (aCursor shape == aShape) ifTrue:[
+            (aCursor graphicsDevice == aDevice) ifTrue:[^ aCursor].
+            oldCursor := aCursor
+        ].
     ].
 
     "found one with same shape, but different device"
     oldCursor notNil ifTrue:[
-	^ oldCursor newOn:aDevice
+        ^ oldCursor newOn:aDevice
     ].
 
     newCursor := self basicNew setShape:aShape.
     Lobby register:newCursor.
     ^ newCursor
+
+    "Modified: 5.7.1996 / 17:58:06 / cg"
 !
 
 sourceForm:aForm
@@ -471,7 +473,7 @@
     ^ newCursor
 ! !
 
-!Cursor class methodsFor:'class initialization'!
+!Cursor  class methodsFor:'class initialization'!
 
 initializeNewCursors
         "Create the new cursors
@@ -1377,7 +1379,7 @@
     "Modified: 29.5.1996 / 15:03:44 / cg"
 ! !
 
-!Cursor class methodsFor:'default access'!
+!Cursor  class methodsFor:'default access'!
 
 defaultFgColor:fgColor defaultBgColor:bgColor
     "set the default colors used for cursors"
@@ -1386,7 +1388,7 @@
     DefaultBgColor := bgColor
 ! !
 
-!Cursor class methodsFor:'standard cursors'!
+!Cursor  class methodsFor:'standard cursors'!
 
 arrow
     "return an arrow (up-left-arrow) cursor"
@@ -1802,8 +1804,8 @@
      myself on aDevice; if one already exists, return the one"
 
     aDevice isNil ifTrue:[
-	"this may not happen"
-	self error:'nil device'
+        "this may not happen"
+        self error:'nil device'
     ].
 
     "if I am already assigned to that device ..."
@@ -1811,25 +1813,27 @@
 
     "first look if not already there"
     Lobby do:[:aCursor |
-	(aCursor device == aDevice) ifTrue:[
-	    shape notNil ifTrue:[
-		(aCursor shape == shape) ifTrue:[
-		    ^ aCursor
-		]
-	    ] ifFalse:[
-		(aCursor sourceForm == sourceForm) ifTrue:[
-		    (aCursor maskForm == maskForm) ifTrue:[
-			(aCursor hotX == hotX) ifTrue:[
-			    (aCursor hotY == hotY) ifTrue:[
-				^ aCursor
-			    ]
-			]
-		    ]
-		]
-	    ]
-	]
+        (aCursor graphicsDevice == aDevice) ifTrue:[
+            shape notNil ifTrue:[
+                (aCursor shape == shape) ifTrue:[
+                    ^ aCursor
+                ]
+            ] ifFalse:[
+                (aCursor sourceForm == sourceForm) ifTrue:[
+                    (aCursor maskForm == maskForm) ifTrue:[
+                        (aCursor hotX == hotX) ifTrue:[
+                            (aCursor hotY == hotY) ifTrue:[
+                                ^ aCursor
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ self newOn:aDevice
+
+    "Modified: 5.7.1996 / 17:58:00 / cg"
 ! !
 
 !Cursor methodsFor:'instance release'!
@@ -1962,9 +1966,9 @@
     hotY := hy.
 ! !
 
-!Cursor class methodsFor:'documentation'!
+!Cursor  class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.37 1996-06-15 13:19:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.38 1996-07-05 16:07:20 cg Exp $'
 ! !
 Cursor initialize!