Author: rfm
Date: Fri Dec 26 12:39:14 2014
New Revision: 38263
URL: http://svn.gna.org/viewcvs/gnustep?rev=38263&view=rev
Log:
Apply David's suggestion ... don't try returning a struct from a message sent
to an object via a proxy ... get the receiving operation object to write the
struct to the correct location via a pointer instead.
Modified:
apps/gworkspace/trunk/Operation/FileOpInfo.h
apps/gworkspace/trunk/Operation/FileOpInfo.m
apps/gworkspace/trunk/Operation/Operation.m
Modified: apps/gworkspace/trunk/Operation/FileOpInfo.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Operation/FileOpInfo.h?rev=38263&r1=38262&r2=38263&view=diff
==============================================================================
--- apps/gworkspace/trunk/Operation/FileOpInfo.h (original)
+++ apps/gworkspace/trunk/Operation/FileOpInfo.h Fri Dec 26 12:39:14 2014
@@ -183,7 +183,7 @@
- (NSWindow *)win;
-- (NSRect)winRect;
+- (void)getWinRect: (Rect*)rptr;
@end
Modified: apps/gworkspace/trunk/Operation/FileOpInfo.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Operation/FileOpInfo.m?rev=38263&r1=38262&r2=38263&view=diff
==============================================================================
--- apps/gworkspace/trunk/Operation/FileOpInfo.m (original)
+++ apps/gworkspace/trunk/Operation/FileOpInfo.m Fri Dec 26 12:39:14 2014
@@ -738,12 +738,12 @@
return win;
}
-- (NSRect)winRect
-{
+- (void) getWinRect: (NSRect*)rptr
+{
+ *rptr = NSZeroRect;
if (win && [win isVisible]) {
- return [win frame];
+ *rptr = [win frame];
}
- return NSZeroRect;
}
@end
Modified: apps/gworkspace/trunk/Operation/Operation.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Operation/Operation.m?rev=38263&r1=38262&r2=38263&view=diff
==============================================================================
--- apps/gworkspace/trunk/Operation/Operation.m (original)
+++ apps/gworkspace/trunk/Operation/Operation.m Fri Dec 26 12:39:14 2014
@@ -375,8 +375,9 @@
FileOpInfo *op = [fileOperations objectAtIndex: i];
if ([op win]) {
- NSRect wr = [op winRect];
-
+ NSRect wr;
+
+ [op getWinRect: &wr];
if (NSEqualRects(wr, NSZeroRect) == NO) {
wrect = NSMakeRect(wr.origin.x + WSHIFT,
wr.origin.y - wr.size.height - WSHIFT,
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
