X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=macosx%2Fosxmain.m;h=2ac772a835aa2883b984e1214fd1cfc9f9981604;hb=5471539a6738484b48fb938c88dce547a3e4b299;hp=362f92bd444993311f6079b5295f82d22225e536;hpb=fe8114d90b3a7719a22f2c3ebe18154191e4ddbd;p=PuTTY.git diff --git a/macosx/osxmain.m b/macosx/osxmain.m index 362f92bd..2ac772a8 100644 --- a/macosx/osxmain.m +++ b/macosx/osxmain.m @@ -20,8 +20,6 @@ AppController *controller; * and Unix PuTTY code. */ -const char platform_x11_best_transport[] = "unix"; - char *platform_get_x_display(void) { return NULL; } @@ -60,7 +58,7 @@ char *x_get_default(const char *key) return NULL; /* this is a stub */ } -static void commonfatalbox(char *p, va_list ap) +static void commonfatalbox(const char *p, va_list ap) { char errorbuf[2048]; NSAlert *alert; @@ -87,7 +85,25 @@ static void commonfatalbox(char *p, va_list ap) exit(1); } -void fatalbox(char *p, ...) +void nonfatal(void *frontend, const char *p, ...) +{ + char *errorbuf; + NSAlert *alert; + va_list ap; + + va_start(ap, p); + errorbuf = dupvprintf(p, ap); + va_end(ap); + + alert = [[[NSAlert alloc] init] autorelease]; + [alert addButtonWithTitle:@"Error"]; + [alert setInformativeText:[NSString stringWithCString:errorbuf]]; + [alert runModal]; + + sfree(errorbuf); +} + +void fatalbox(const char *p, ...) { va_list ap; va_start(ap, p); @@ -95,7 +111,7 @@ void fatalbox(char *p, ...) va_end(ap); } -void modalfatalbox(char *p, ...) +void modalfatalbox(const char *p, ...) { va_list ap; va_start(ap, p); @@ -103,7 +119,7 @@ void modalfatalbox(char *p, ...) va_end(ap); } -void cmdline_error(char *p, ...) +void cmdline_error(const char *p, ...) { va_list ap; fprintf(stderr, "%s: ", appname);