Mercurial > dwindows
comparison mac/dw.m @ 2945:7e7b38472c3d
Mac: dw_messagebox() changes in that last commit didn't account for return;
Use a retval variable instead which returns after draining the pool.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 02 Jan 2023 01:44:17 +0000 |
parents | fbf43ea71c8e |
children | edb4307ac7ce |
comparison
equal
deleted
inserted
replaced
2944:3dde7456c9f6 | 2945:7e7b38472c3d |
---|---|
4393 NSString *button3 = nil; | 4393 NSString *button3 = nil; |
4394 NSString *mtitle = [NSString stringWithUTF8String:title]; | 4394 NSString *mtitle = [NSString stringWithUTF8String:title]; |
4395 NSString *mtext; | 4395 NSString *mtext; |
4396 NSAlertStyle mstyle = DWAlertStyleWarning; | 4396 NSAlertStyle mstyle = DWAlertStyleWarning; |
4397 NSArray *params; | 4397 NSArray *params; |
4398 int retval = 0; | |
4398 | 4399 |
4399 if(flags & DW_MB_OKCANCEL) | 4400 if(flags & DW_MB_OKCANCEL) |
4400 { | 4401 { |
4401 button2 = @"Cancel"; | 4402 button2 = @"Cancel"; |
4402 } | 4403 } |
4425 | 4426 |
4426 switch(iResponse) | 4427 switch(iResponse) |
4427 { | 4428 { |
4428 case NSAlertFirstButtonReturn: /* user pressed OK */ | 4429 case NSAlertFirstButtonReturn: /* user pressed OK */ |
4429 if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL) | 4430 if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL) |
4430 { | 4431 retval = DW_MB_RETURN_YES; |
4431 return DW_MB_RETURN_YES; | 4432 else |
4432 } | 4433 retval = DW_MB_RETURN_OK; |
4433 return DW_MB_RETURN_OK; | 4434 break; |
4434 case NSAlertSecondButtonReturn: /* user pressed Cancel */ | 4435 case NSAlertSecondButtonReturn: /* user pressed Cancel */ |
4435 if(flags & DW_MB_OKCANCEL) | 4436 if(flags & DW_MB_OKCANCEL) |
4436 { | 4437 retval = DW_MB_RETURN_CANCEL; |
4437 return DW_MB_RETURN_CANCEL; | 4438 else |
4438 } | 4439 retval = DW_MB_RETURN_NO; |
4439 return DW_MB_RETURN_NO; | 4440 break; |
4440 case NSAlertThirdButtonReturn: /* user pressed the third button */ | 4441 case NSAlertThirdButtonReturn: /* user pressed the third button */ |
4441 return DW_MB_RETURN_CANCEL; | 4442 retval = DW_MB_RETURN_CANCEL; |
4443 break; | |
4442 } | 4444 } |
4443 DW_LOCAL_POOL_OUT; | 4445 DW_LOCAL_POOL_OUT; |
4444 return 0; | 4446 return retval; |
4445 } | 4447 } |
4446 | 4448 |
4447 /* | 4449 /* |
4448 * Opens a file dialog and queries user selection. | 4450 * Opens a file dialog and queries user selection. |
4449 * Parameters: | 4451 * Parameters: |