--- a/WinWorkstation.st Mon Feb 04 17:27:46 2013 +0100
+++ b/WinWorkstation.st Mon Feb 04 18:31:22 2013 +0100
@@ -7395,7 +7395,7 @@
in aPoint and returns a device coordinate relative to the 2nd views origin.
- use to xlate points from a window to rootwindow"
- |x1 y1 x2 y2|
+ |x1 y1 x2 y2 ret|
x1 := x2 := aPoint x truncated.
y1 := y2 := aPoint y truncated.
@@ -7411,18 +7411,18 @@
w2 = _HWNDVal(windowId2);
point.x = __intVal(x1);
point.y = __intVal(y1);
- CPRINTF(("TransPoint %x %d/%d ->",w1,point.x,point.y));
- if (ClientToScreen(w1,&point) == FALSE) {
+ CPRINTF(("TransPoint %x %d/%d ->", w1, point.x, point.y));
+ if (ClientToScreen(w1, &point) == FALSE) {
RETURN (nil);
}
- if (ScreenToClient(w2,&point) == FALSE) {
+ if (ScreenToClient(w2, &point) == FALSE) {
RETURN (nil);
}
- CPRINTF((" %x %d/%d\n",w2,point.x,point.y));
- RETURN (__MKPOINT_INT(point.x, point.y));
- }
- RETURN (nil);
-%}.
+ CPRINTF((" %x %d/%d\n", w2, point.x, point.y));
+ ret = __MKPOINT_INT(point.x, point.y);
+ }
+%}.
+ ^ ret
!
vendorRelease
@@ -19301,11 +19301,11 @@
!WinWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.470 2013-02-04 16:27:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.471 2013-02-04 17:31:22 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.470 2013-02-04 16:27:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.471 2013-02-04 17:31:22 cg Exp $'
! !
WinWorkstation initialize!