--- a/Cursor.st	Tue Mar 08 17:16:44 2016 +0100
+++ b/Cursor.st	Sun Mar 13 00:28:43 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#Cursor
 	instanceVariableNames:'shape sourceForm maskForm hotX hotY device cursorId'
 	classVariableNames:'DefaultFgColor DefaultBgColor NormalCursor HandCursor ArrowCursor
@@ -366,6 +370,9 @@
     ].
     aDevice releaseDeviceCursors
 
+    "
+     self flushDeviceCursorsFor:Display
+    "
 !
 
 initialize
@@ -403,8 +410,9 @@
             Cursor eye
             Cursor eyeClosed"
 
-    |bits isWindows|
-
+    |bits mask isWindows|
+
+    "/ HandCursor := nil.
     HandCursor notNil ifTrue:[^ self].
 
     Screen isNil ifTrue:[
@@ -2127,44 +2135,51 @@
                     offset: -8 @ -8).
     ClosedEyeCursor setShape:#eyeClosed.
 
+    isWindows ifTrue:[
+        "/ want it white-with black boundary
+        bits := #[7 128 24 96 32 16 39 136 24 72 0 72 0 72 0 144 1 32 2 64 2 64 2 64 1 128 2 64 2 64 1 128].
+        mask := #[7 128 31 224 63 240 63 248 24 120 0 120 0 120 0 240 1 224 3 192 3 192 3 192 1 128 3 192 3 192 1 128].
+    ] ifFalse:[
+        bits := #( 
+                  2r0000000000000000
+                  2r0000000000000000
+                  2r0000001111000000
+                  2r0000111111110000
+                  2r0000110000111000
+                  2r0000000000011000
+                  2r0000000000011000
+                  2r0000000000011000
+                  2r0000000000110000
+                  2r0000000001100000
+                  2r0000000110000000
+                  2r0000000110000000
+                  2r0000000000000000
+                  2r0000000110000000
+                  2r0000000110000000
+                  2r0000000000000000).
+        mask := #(  
+                  2r0000000000000000
+                  2r0000011111000000
+                  2r0000111111100000
+                  2r0001111111111000
+                  2r0001111111111100
+                  2r0001111000111100
+                  2r0000000000111100
+                  2r0000000000111100
+                  2r0000000001111000
+                  2r0000000011110000
+                  2r0000001111000000
+                  2r0000001111000000
+                  2r0000001111000000
+                  2r0000001111000000
+                  2r0000001111000000
+                  2r0000001111000000).
+    ].
+
     QuestionMarkCursor := (Cursor
                     extent: 16@16
-                    sourceArray: #(
-                        2r0000000000000000
-                        2r0000000000000000
-                        2r0000001111000000
-                        2r0000111111110000
-                        2r0000110000111000
-                        2r0000000000011000
-                        2r0000000000011000
-                        2r0000000000011000
-                        2r0000000000110000
-                        2r0000000001100000
-                        2r0000000110000000
-                        2r0000000110000000
-                        2r0000000000000000
-                        2r0000000110000000
-                        2r0000000110000000
-                        2r0000000000000000
-                        )
-                    maskArray: #(
-                        2r0000000000000000
-                        2r0000011111000000
-                        2r0000111111100000
-                        2r0001111111111000
-                        2r0001111111111100
-                        2r0001111000111100
-                        2r0000000000111100
-                        2r0000000000111100
-                        2r0000000001111000
-                        2r0000000011110000
-                        2r0000001111000000
-                        2r0000001111000000
-                        2r0000001111000000
-                        2r0000001111000000
-                        2r0000001111000000
-                        2r0000001111000000
-                       )
+                    sourceArray:bits 
+                    maskArray:mask 
                     offset: -8 @ -8).
     QuestionMarkCursor setShape:#questionMark.
 
@@ -3531,11 +3546,11 @@
 !Cursor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.115 2014-11-20 15:15:44 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/Cursor.st,v 1.115 2014-11-20 15:15:44 stefan Exp $'
+    ^ '$Header$'
 ! !