--- a/WinWorkstat.st	Tue Aug 11 22:02:45 1998 +0200
+++ b/WinWorkstat.st	Wed Aug 12 13:05:08 1998 +0200
@@ -907,11 +907,11 @@
 
   if (mask != ~0)
   {
-    PRINTF(("deqEvent mask:%x\n",mask));
+    CPRINTF(("deqEvent mask:%x\n",mask));
   }
   if (hWnd)
   {
-    PRINTF(("deqEvent hWnd:%x\n",hWnd));
+    CPRINTF(("deqEvent hWnd:%x\n",hWnd));
   }
   if (lockEvent())
   {
@@ -1154,7 +1154,7 @@
 		     */
 		    return 0;
 		}
-		DDPRINTF(("WM_SETCURSOR\n"));
+		CPRINTF(("WM_SETCURSOR %x\n",hWnd));
 		curs = GetWindow_Cursor(hWnd);
 		if (curs) {
 		    SetCursor(curs);
@@ -1982,7 +1982,7 @@
 	  if (msg.lParam)
 	  {
 	    if (AttachThreadInput(_dispatchThreadId,msg.lParam,TRUE) == FALSE)
-	      PRINTF(("SetFocus AttachThreadInput error %d\n",GetLastError()));
+	      CPRINTF(("SetFocus AttachThreadInput error %d\n",GetLastError()));
 	  }
 #endif
 	  CPRINTF(("threadSetfocus %x\n",msg.wParam));
@@ -4090,7 +4090,7 @@
 	else
 	{
 	    cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
-            printf("malloc for Bitmap\n");
+            CPRINTF(("malloc for Bitmap\n"));
 	}
 	if (cp)
 	{
@@ -4240,7 +4240,7 @@
 	    else
 	    {
 		ep = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for Bitmap1\n");
+                CPRINTF(("malloc for Bitmap1\n"));
 	    }
 	    if ( ep != 0 )
 	    {
@@ -5842,7 +5842,7 @@
 	    else
 	    {
 		cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for drawBits\n");
+                CPRINTF(("malloc for drawBits\n"));
 	    }
 	    if (cp)
 	    {
@@ -9503,7 +9503,7 @@
 	    else
 	    {
 		ep = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for windowIcon\n");
+                CPRINTF(("malloc for windowIcon\n"));
 	    }
 	    if( ep != 0 ) {
 		memset(ep,0,nBytes);
@@ -9615,10 +9615,11 @@
 	HWND win = _HWNDVal(aWindowId);
 	POINT p;
 
-	/*printf("setCursor:in:\n");*/
+	/*printf("setCursor:%x in:%x\n",_HCURSORVal(aCursorId),win);*/
 	SetWindow_Cursor(win, _HCURSORVal(aCursorId));
 #if 1
-        PostMessage(win,WM_SETCURSOR,0,HTCLIENT);
+        PostMessage(win,WM_THREADSETCAPTURE,0,(INT)_HCURSORVal(aCursorId));
+        //PostMessage(win,WM_SETCURSOR,0,HTCLIENT);
 #else
 	/*
 	 * if the pointer is currently in that window ...
@@ -9784,6 +9785,6 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/WinWorkstat.st,v 1.36 1998-08-10 10:05:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/WinWorkstat.st,v 1.37 1998-08-12 11:05:08 cg Exp $'
 ! !
 WinWorkstation initialize!

--- a/WinWorkstation.st	Tue Aug 11 22:02:45 1998 +0200
+++ b/WinWorkstation.st	Wed Aug 12 13:05:08 1998 +0200
@@ -907,11 +907,11 @@
 
   if (mask != ~0)
   {
-    PRINTF(("deqEvent mask:%x\n",mask));
+    CPRINTF(("deqEvent mask:%x\n",mask));
   }
   if (hWnd)
   {
-    PRINTF(("deqEvent hWnd:%x\n",hWnd));
+    CPRINTF(("deqEvent hWnd:%x\n",hWnd));
   }
   if (lockEvent())
   {
@@ -1154,7 +1154,7 @@
 		     */
 		    return 0;
 		}
-		DDPRINTF(("WM_SETCURSOR\n"));
+		CPRINTF(("WM_SETCURSOR %x\n",hWnd));
 		curs = GetWindow_Cursor(hWnd);
 		if (curs) {
 		    SetCursor(curs);
@@ -1982,7 +1982,7 @@
 	  if (msg.lParam)
 	  {
 	    if (AttachThreadInput(_dispatchThreadId,msg.lParam,TRUE) == FALSE)
-	      PRINTF(("SetFocus AttachThreadInput error %d\n",GetLastError()));
+	      CPRINTF(("SetFocus AttachThreadInput error %d\n",GetLastError()));
 	  }
 #endif
 	  CPRINTF(("threadSetfocus %x\n",msg.wParam));
@@ -4090,7 +4090,7 @@
 	else
 	{
 	    cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
-            printf("malloc for Bitmap\n");
+            CPRINTF(("malloc for Bitmap\n"));
 	}
 	if (cp)
 	{
@@ -4240,7 +4240,7 @@
 	    else
 	    {
 		ep = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for Bitmap1\n");
+                CPRINTF(("malloc for Bitmap1\n"));
 	    }
 	    if ( ep != 0 )
 	    {
@@ -5842,7 +5842,7 @@
 	    else
 	    {
 		cp = b_bits = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for drawBits\n");
+                CPRINTF(("malloc for drawBits\n"));
 	    }
 	    if (cp)
 	    {
@@ -9503,7 +9503,7 @@
 	    else
 	    {
 		ep = allocatedBits = (unsigned char *) malloc(nBytes);
-                printf("malloc for windowIcon\n");
+                CPRINTF(("malloc for windowIcon\n"));
 	    }
 	    if( ep != 0 ) {
 		memset(ep,0,nBytes);
@@ -9615,10 +9615,11 @@
 	HWND win = _HWNDVal(aWindowId);
 	POINT p;
 
-	/*printf("setCursor:in:\n");*/
+	/*printf("setCursor:%x in:%x\n",_HCURSORVal(aCursorId),win);*/
 	SetWindow_Cursor(win, _HCURSORVal(aCursorId));
 #if 1
-        PostMessage(win,WM_SETCURSOR,0,HTCLIENT);
+        PostMessage(win,WM_THREADSETCAPTURE,0,(INT)_HCURSORVal(aCursorId));
+        //PostMessage(win,WM_SETCURSOR,0,HTCLIENT);
 #else
 	/*
 	 * if the pointer is currently in that window ...
@@ -9784,6 +9785,6 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.36 1998-08-10 10:05:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.37 1998-08-12 11:05:08 cg Exp $'
 ! !
 WinWorkstation initialize!