summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-06-29 10:45:46 -0400
committerPietro Gagliardi <[email protected]>2014-06-29 10:45:46 -0400
commit580b06638fb8b59617c93a180cb8808623fb4521 (patch)
tree00fe50731bef4b60b0178e19e1a3e78ab0ed7ec2
parentbc50405364ac907e465a37ccf1de4060a07d710d (diff)
More of the same conversion.
-rw-r--r--delegateuitask_darwin.m6
-rw-r--r--dialog_darwin.m3
2 files changed, 6 insertions, 3 deletions
diff --git a/delegateuitask_darwin.m b/delegateuitask_darwin.m
index 84be5be..e30ebc2 100644
--- a/delegateuitask_darwin.m
+++ b/delegateuitask_darwin.m
@@ -92,9 +92,11 @@ extern NSRect dummyRect;
return NSTerminateNow;
}
-- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)chan
+- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)data
{
- dialog_send(chan, (uintptr_t) returnCode);
+ NSInteger *ret = (NSInteger *) data;
+
+ *ret = returnCode;
}
@end
diff --git a/dialog_darwin.m b/dialog_darwin.m
index 10a5f26..cd4e684 100644
--- a/dialog_darwin.m
+++ b/dialog_darwin.m
@@ -23,13 +23,14 @@ static void alert(id parent, NSString *primary, NSString *secondary, NSAlertStyl
if (parent == nil)
return (intptr_t) [box runModal];
else {
- NSInteger *ret;
+ NSInteger ret;
[box beginSheetModalForWindow:toNSWindow(parent)
modalDelegate:[NSApp delegate]
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
contextInfo:&ret];
// TODO
+ return (intptr_t) ret;
}
}