Mercurial > dwindows

changeset 1895:fafe1a68f0fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed OS X 10.9 issues by migrating to NSAlert from newly deprecated methods.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 25 Oct 2013 09:38:21 +0000
parents ed377fd16360
children 8637a32d33d9
files mac/dw.m
diffstat 1 files changed, 11 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Fri Oct 18 10:59:37 2013 +0000
+++ b/mac/dw.m	Fri Oct 25 09:38:21 2013 +0000
@@ -3363,16 +3363,12 @@
  */
 int API dw_messagebox(char *title, int flags, char *format, ...)
 {
-    int iResponse;
+    NSAlert *alert;
+    NSInteger iResponse;
     NSString *button1 = @"OK";
     NSString *button2 = nil;
     NSString *button3 = nil;
     va_list args;
-    char outbuf[1025] = {0};
-
-    va_start(args, format);
-    vsnprintf(outbuf, 1024, format, args);
-    va_end(args);
 
     if(flags & DW_MB_OKCANCEL)
     {
@@ -3390,27 +3386,18 @@
         button3 = @"Cancel";
     }
 
+    va_start(args, format);
+    alert = [NSAlert alertWithMessageText:[ NSString stringWithUTF8String:title ] defaultButton:button1 alternateButton:button2 otherButton:button3 informativeTextWithFormat:@"%@", [[[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args] autorelease]];
+    va_end(args);
+    
+    iResponse = [alert runModal];
+    
     if(flags & DW_MB_ERROR)
-    {
-        iResponse = (int)
-        NSRunCriticalAlertPanel([ NSString stringWithUTF8String:title ],
-                                [ NSString stringWithUTF8String:outbuf ],
-                                button1, button2, button3);
-    }
+        [alert setAlertStyle:NSCriticalAlertStyle];
     else if(flags & DW_MB_INFORMATION)
-    {
-        iResponse = (int)
-        NSRunInformationalAlertPanel([ NSString stringWithUTF8String:title ],
-                                [ NSString stringWithUTF8String:outbuf ],
-                                button1, button2, button3);
-    }
+        [alert setAlertStyle:NSInformationalAlertStyle];
     else
-    {
-        iResponse = (int)
-        NSRunAlertPanel([ NSString stringWithUTF8String:title ],
-                        [ NSString stringWithUTF8String:outbuf ],
-                        button1, button2, button3);
-    }
+        [alert setAlertStyle:NSWarningAlertStyle];
 
     switch(iResponse)
     {