Revision: 29932
          http://sourceforge.net/p/bibdesk/svn/29932
Author:   hofman
Date:     2025-12-02 15:57:07 +0000 (Tue, 02 Dec 2025)
Log Message:
-----------
use NSModalResponse type

Modified Paths:
--------------
    trunk/bibdesk/BDSKAuthenticationController.m
    trunk/bibdesk/BDSKBookmarkController.m
    trunk/bibdesk/BDSKDocumentController.m
    trunk/bibdesk/BDSKEditor.m
    trunk/bibdesk/BDSKFieldSheetController.m
    trunk/bibdesk/BDSKFileMatchConfigController.m
    trunk/bibdesk/BDSKFileMatcher.m
    trunk/bibdesk/BDSKMacroWindowController.m
    trunk/bibdesk/BDSKMainTableView.m
    trunk/bibdesk/BDSKOrphanedFilesFinder.m
    trunk/bibdesk/BDSKPersonController.m
    trunk/bibdesk/BDSKPreferenceController.m
    trunk/bibdesk/BDSKPreviewer.m
    trunk/bibdesk/BDSKScriptGroupSheetController.m
    trunk/bibdesk/BDSKSearchBookmarkController.m
    trunk/bibdesk/BDSKSearchGroupSheetController.m
    trunk/bibdesk/BDSKTemplateDocument.m
    trunk/bibdesk/BDSKTextImportController.h
    trunk/bibdesk/BDSKTextImportController.m
    trunk/bibdesk/BDSKTypeInfoEditor.m
    trunk/bibdesk/BDSKURLGroupSheetController.m
    trunk/bibdesk/BDSKZoomablePDFView.m
    trunk/bibdesk/BibDocument.m
    trunk/bibdesk/BibDocument_Actions.m
    trunk/bibdesk/BibDocument_DataSource.m
    trunk/bibdesk/BibDocument_Groups.m
    trunk/bibdesk/BibDocument_Search.m
    trunk/bibdesk/BibPref_AutoFile.m
    trunk/bibdesk/BibPref_CiteKey.m
    trunk/bibdesk/BibPref_Defaults.m
    trunk/bibdesk/BibPref_Export.m
    trunk/bibdesk/BibPref_Files.m
    trunk/bibdesk/BibPref_General.m
    trunk/bibdesk/BibPref_ScriptHooks.m
    trunk/bibdesk/BibPref_TeX.m
    trunk/bibdesk/NSWindowController_BDSKExtensions.h
    trunk/bibdesk/NSWindowController_BDSKExtensions.m

Modified: trunk/bibdesk/BDSKAuthenticationController.m
===================================================================
--- trunk/bibdesk/BDSKAuthenticationController.m        2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/BDSKAuthenticationController.m        2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -140,7 +140,7 @@
     
     if (window) {
         usingSheet = YES;
-        [self beginSheetModalForWindow:window completionHandler:^(NSInteger 
result){
+        [self beginSheetModalForWindow:window 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK)
                 completionHandler(NSURLSessionAuthChallengeUseCredential, 
[self credential]);
             else

Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m      2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKBookmarkController.m      2025-12-02 15:57:07 UTC (rev 
29932)
@@ -188,7 +188,7 @@
     [self addMenuItemsForBookmarks:@[bookmarkRoot] level:0 toMenu:[folderPopUp 
menu]];
     [folderPopUp selectItemAtIndex:0];
        
-    [bookmarkSheetController beginSheetModalForWindow:window 
completionHandler:^(NSInteger result){
+    [bookmarkSheetController beginSheetModalForWindow:window 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             BDSKBookmark *bookmark = [[BDSKBookmark alloc] initWithURL:aURL 
name:[bookmarkSheetController stringValue]];
             if (bookmark) {

Modified: trunk/bibdesk/BDSKDocumentController.m
===================================================================
--- trunk/bibdesk/BDSKDocumentController.m      2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKDocumentController.m      2025-12-02 15:57:07 UTC (rev 
29932)
@@ -280,7 +280,7 @@
     // reset this in case this was called from 
openDocumentUsingPhonyCiteKeys:, openDocumentUsingFilter:, or 
openTemplateDocument:
     openType = BDSKOpenDefault;
     
-    [super beginOpenPanel:openPanel forTypes:inTypes 
completionHandler:^(NSInteger result){
+    [super beginOpenPanel:openPanel forTypes:inTypes 
completionHandler:^(NSModalResponse result){
             [self openPanel:openPanel 
usingAccessoryController:accessoryController openType:currentOpenType 
didEndWithResult:result];
             completionHandler(result);
         }];

Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m  2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKEditor.m  2025-12-02 15:57:07 UTC (rev 29932)
@@ -694,7 +694,7 @@
             [alert setInformativeText:NSLocalizedString(@"Downloading will 
overwrite the current value of the Local-Url field. Do you want to proceed?", 
@"Informative text in alert dialog")];
             [alert addButtonWithTitle:NSLocalizedString(@"Download", @"Button 
title")];
             [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
-            [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
                 if (returnCode == NSAlertFirstButtonReturn)
                     [publication downloadURLForField:BDSKUrlString 
options:BDSKDownloadDefault];
             }];
@@ -762,7 +762,7 @@
         [oPanel setAccessoryView:disableAutoFileButton];
        }
     
-    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             NSURL *aURL = [[oPanel URLs] objectAtIndex:0];
             BOOL shouldAutoFile = disableAutoFileButton && [oPanel 
accessoryView] == disableAutoFileButton && [disableAutoFileButton state] == 
NSControlStateValueOff;
@@ -810,7 +810,7 @@
     BDSKURLSheetController *urlController = [[BDSKURLSheetController alloc] 
init];
     
     [urlController setUrlString:urlString];
-    [urlController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [urlController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             // remove the sheet in case we get an alert
             [[urlController window] orderOut:nil];
@@ -870,7 +870,7 @@
         
         BDSKFieldSheetController *addFieldController = 
[BDSKFieldSheetController fieldSheetControllerWithChoosableFields:fieldNames
                                                                                
  label:NSLocalizedString(@"Name of field to add:", @"Label for adding field")];
-        [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+        [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
             NSString *newField = [addFieldController chosenField];
             if(result == NSModalResponseCancel || newField == nil)
                 return;
@@ -922,7 +922,7 @@
         if ([[[tabView selectedTabViewItem] identifier] 
isEqualToString:BDSKBibtexString] == NO)
             [tabView selectFirstTabViewItem:nil];
         
-        [removeFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+        [removeFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
             NSString *oldField = [removeFieldController selectedField];
             NSString *oldValue = [publication valueOfField:oldField 
inherit:NO];
             
@@ -977,7 +977,7 @@
     if (field)
         [changeFieldController setSelectedField:field];
     
-       [changeFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+       [changeFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         NSString *oldField = [changeFieldController selectedField];
         NSString *newField = [changeFieldController chosenField];
         NSString *oldValue = [publication valueOfField:oldField inherit:NO] ?: 
@"";
@@ -1078,7 +1078,7 @@
         [alert setShowsSuppressionButton:YES];
         
         // use didDismissSelector or else we can have sheets competing for the 
window
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if ([[alert suppressionButton] state] == NSControlStateValueOn)
                 [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKWarnOnCiteKeyChangeKey];
             if (returnCode == NSAlertFirstButtonReturn) {
@@ -1170,7 +1170,7 @@
         if (otherButton)
             [alert addButtonWithTitle:otherButton];
         [[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")] setTag:NSAlertThirdButtonReturn];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode != NSAlertThirdButtonReturn) {
                 // remove the sheet in case we get an alert
                 [[alert window] orderOut:nil];
@@ -1770,7 +1770,7 @@
             [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button 
title")];
             [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button 
title")];
             [alert setShowsSuppressionButton:YES];
-            [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
                 if (alert && [[alert suppressionButton] state] == 
NSControlStateValueOn)
                     [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKAskToTrashFilesKey];
                 if (returnCode == NSAlertSecondButtonReturn)
@@ -2892,7 +2892,7 @@
         [alert addButtonWithTitle:NSLocalizedString(@"Edit", @"Button title")];
         if (discardMsg)
             [alert addButtonWithTitle:discardMsg];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             switch (returnCode){
                 case NSAlertSecondButtonReturn:
                     break; // do nothing

Modified: trunk/bibdesk/BDSKFieldSheetController.m
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.m    2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKFieldSheetController.m    2025-12-02 15:57:07 UTC (rev 
29932)
@@ -114,7 +114,7 @@
         [chosenFieldComboBox removeFromSuperview];
 }
 
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSModalResponse result))handler {
     [self window];
     [self prepare];
     [super beginSheetModalForWindow:window completionHandler:handler];

Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m       2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m       2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -112,7 +112,7 @@
         [openPanel setAllowsMultipleSelection:YES];
         [openPanel setCanChooseDirectories:YES];
         [openPanel setPrompt:NSLocalizedString(@"Choose", @"")];
-        [openPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+        [openPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK)
                 [[self mutableArrayValueForKey:@"files"] 
addObjectsFromArray:[self URLsFromURLsAndDirectories:[openPanel URLs]]];
         }];

Modified: trunk/bibdesk/BDSKFileMatcher.m
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.m     2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKFileMatcher.m     2025-12-02 15:57:07 UTC (rev 29932)
@@ -197,7 +197,7 @@
 - (IBAction)configure:(id)sender;
 {
     BDSKFileMatchConfigController *config = [[BDSKFileMatchConfigController 
alloc] init];
-    [config beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [config beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         [self matchFiles:[config files] withPublications:[config 
publications]];
     }];
 }

Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m   2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKMacroWindowController.m   2025-12-02 15:57:07 UTC (rev 
29932)
@@ -307,7 +307,7 @@
     [super showWindow:sender];
 }
 
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSModalResponse result))handler {
     [self window]; // make sure we loaded the nib
     [tableView reloadData];
     [closeButton setKeyEquivalent:@"\E"];

Modified: trunk/bibdesk/BDSKMainTableView.m
===================================================================
--- trunk/bibdesk/BDSKMainTableView.m   2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKMainTableView.m   2025-12-02 15:57:07 UTC (rev 29932)
@@ -572,7 +572,7 @@
     
     BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController 
fieldSheetControllerWithChoosableFields:colNames
                                                                              
label:NSLocalizedString(@"Name of column to add:", @"Label for adding column")];
-       [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+       [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         NSString *newColumnName = [addFieldController chosenField];
         if (result == NSModalResponseOK && newColumnName && [[self 
tableColumnIdentifiers] containsObject:newColumnName] == NO) {
             [self addTableColumnWithIdentifier:newColumnName];

Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m     2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m     2025-12-02 15:57:07 UTC (rev 
29932)
@@ -211,7 +211,7 @@
         [alert setInformativeText:NSLocalizedString(@"You have chosen your 
Home Folder as your Papers Folder. Finding all orphaned files in this folder 
could take a long time. Do you want to proceed?", @"Informative text in alert 
dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"Find", @"Button title: 
find orphaned files")];
         [alert addButtonWithTitle:NSLocalizedString(@"Don't Find", @"Button 
title: don't find orphaned files")];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertFirstButtonReturn)
                 [self refreshOrphanedFiles];
         }];
@@ -327,7 +327,7 @@
     [alert setInformativeText:NSLocalizedString(@"Do you want to move the 
removed files to the trash?", @"Informative text in alert dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
-    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn)
             [self trashFiles:files];
     }];
@@ -349,7 +349,7 @@
         [alert setInformativeText:NSLocalizedString(@"Do you want to move the 
removed files to the trash?", @"Informative text in alert dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertFirstButtonReturn)
                 [self trashFiles:draggedFiles];
         }];

Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m        2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKPersonController.m        2025-12-02 15:57:07 UTC (rev 
29932)
@@ -288,7 +288,7 @@
         [editField setStringValue:[[nameArrayController selectedObjects] 
objectAtIndex:0]];
         [editField selectText:self];
         
-        [[self window] beginSheet:editSheet completionHandler:^(NSInteger 
result){
+        [[self window] beginSheet:editSheet 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 NSString *newName = [editField stringValue];
                 if ([NSString isEmptyString:newName] == NO)
@@ -447,7 +447,7 @@
     [editField setStringValue:[newAuthor name]];
     [editField selectText:self];
     
-    [[self window] beginSheet:editSheet completionHandler:^(NSInteger result){
+    [[self window] beginSheet:editSheet completionHandler:^(NSModalResponse 
result){
         if (result == NSModalResponseOK) {
             NSString *newName = [editField stringValue];
             if ([NSString isEmptyString:newName] == NO)

Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m    2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKPreferenceController.m    2025-12-02 15:57:07 UTC (rev 
29932)
@@ -241,7 +241,7 @@
     [alert setInformativeText:NSLocalizedString(@"Choosing Reset will restore 
all settings in this pane to the state they were in when the application was 
first installed.", @"Informative text in alert dialog when pressing Reset All 
button")];
     [alert addButtonWithTitle:NSLocalizedString(@"Reset", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn) {
             NSDictionary *initialValues = [[self selectedPane] initialValues];
             if ([initialValues count])
@@ -257,7 +257,7 @@
     [alert setInformativeText:NSLocalizedString(@"Choosing Reset will restore 
all settings to the state they were in when the application was first 
installed.", @"Informative text in alert dialog when pressing Reset All 
button")];
     [alert addButtonWithTitle:NSLocalizedString(@"Reset", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn) {
             [[NSUserDefaultsController sharedUserDefaultsController] 
revertToInitialValues:nil];
             [[panes allValues] 
makeObjectsPerformSelector:@selector(defaultsDidRevert)];

Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m       2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKPreviewer.m       2025-12-02 15:57:07 UTC (rev 29932)
@@ -224,7 +224,7 @@
         [alert setInformativeText:NSLocalizedString(@"TeX previewing must be 
enabled in BibDesk's preferences in order to use this feature.  Would you like 
to open the preference pane now?", @"Informative text in alert dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertFirstButtonReturn) {
                 [[BDSKPreferenceController sharedPreferenceController] 
showWindow:nil];
                 [[BDSKPreferenceController sharedPreferenceController] 
selectPaneWithIdentifier:@"edu.ucsd.cs.mmccrack.bibdesk.prefpane.TeX"];

Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m      2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m      2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -123,7 +123,7 @@
     [oPanel setPrompt:NSLocalizedString(@"Choose", @"Prompt for Choose 
panel")];
     [oPanel setDelegate:self];
     
-    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSURL *url = [[oPanel URLs] firstObject];
             [self setPath:[url path]];

Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m        2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m        2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -265,7 +265,7 @@
             NSDictionary *oldInfo = [selectedItem info];
             BDSKServerInfo *serverInfo = [[BDSKServerInfo alloc] 
initWithDictionary:oldInfo];
             BDSKSearchGroupSheetController *sheetController = 
[[BDSKSearchGroupSheetController alloc] initWithServerInfo:serverInfo];
-            [sheetController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+            [sheetController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
                 if (result == NSModalResponseOK) {
                     NSMutableDictionary *info = [[[sheetController serverInfo] 
dictionaryValue] mutableCopy];
                     [info setValue:[oldInfo valueForKey:@"search term"] 
forKey:@"search term"];

Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m      2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m      2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -285,7 +285,7 @@
     [alert setInformativeText:NSLocalizedString(@"This will restore the 
default server settings to their original values. This action cannot be 
undone.", @"Informative text in alert dialog when resetting default search 
group servers")];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn) {
             [[BDSKSearchGroupServerManager sharedManager] resetServers];
             [self reloadServersSelectingServerNamed:DEFAULT_SERVER_NAME];

Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m        2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKTemplateDocument.m        2025-12-02 15:57:07 UTC (rev 
29932)
@@ -667,7 +667,7 @@
     NSArray *allFields = [[BDSKTypeManager sharedManager] 
allFieldNamesIncluding:nil excluding:nil];
     BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController 
fieldSheetControllerWithChoosableFields:allFields
                                                                              
label:NSLocalizedString(@"Field:", @"Label for adding a field for a template")];
-       [addFieldController beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSInteger result){
+       [addFieldController beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSModalResponse result){
         NSString *newField = [addFieldController chosenField];
         if (result == NSModalResponseOK && [NSString isEmptyString:newField] 
== NO) {
             NSArray *tokens = [self tokensForFields:@[newField]];

Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h    2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKTextImportController.h    2025-12-02 15:57:07 UTC (rev 
29932)
@@ -135,7 +135,7 @@
 @property (nonatomic, readonly) BibItem *publication;
 @property (nonatomic, readonly) NSArray<BibItem *> *addedPublications;
 
-- (void)beginSheetForURL:(nullable NSURL *)aURL modalForWindow:(NSWindow 
*)aWindow completionHandler:(void (^ _Nullable )(NSInteger result))handler;
+- (void)beginSheetForURL:(nullable NSURL *)aURL modalForWindow:(NSWindow 
*)aWindow completionHandler:(void (^ _Nullable )(NSModalResponse 
result))handler;
 
 - (IBAction)addItemAction:(nullable id)sender;
 - (IBAction)closeAction:(nullable id)sender;

Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m    2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKTextImportController.m    2025-12-02 15:57:07 UTC (rev 
29932)
@@ -238,7 +238,7 @@
 
 #pragma mark Calling the main sheet
 
-- (void)beginSheetForURL:(NSURL *)aURL modalForWindow:(NSWindow *)aWindow 
completionHandler:(void (^)(NSInteger result))handler {
+- (void)beginSheetForURL:(NSURL *)aURL modalForWindow:(NSWindow *)aWindow 
completionHandler:(void (^)(NSModalResponse result))handler {
     // make sure we loaded the nib
     [self window];
     if (aURL == nil)
@@ -250,7 +250,7 @@
     [super beginSheetModalForWindow:aWindow completionHandler:handler];
 }
 
-- (void)beginSheetModalForWindow:(NSWindow *)aWindow completionHandler:(void 
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)aWindow completionHandler:(void 
(^)(NSModalResponse result))handler {
     [self beginSheetForURL:nil modalForWindow:aWindow 
completionHandler:handler];
 }
 
@@ -346,7 +346,7 @@
 
 - (IBAction)importFromWebAction:(id)sender{
        BDSKURLSheetController *urlSheetController = [[BDSKURLSheetController 
alloc] init];
-    [urlSheetController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [urlSheetController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             // setup webview and load page
             
@@ -373,7 +373,7 @@
     [oPanel setCanChooseDirectories:NO];
     [oPanel setAllowedFileTypes:[NSAttributedString textTypes]];
 
-    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK)
             [self loadFromFileURL:[[oPanel URLs] lastObject]];
     }];
@@ -404,7 +404,7 @@
     
     BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController 
fieldSheetControllerWithChoosableFields:fieldNames
                                                                              
label:NSLocalizedString(@"Name of field to add:",@"Label for adding field")];
-       [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+       [addFieldController beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         NSString *newField = [addFieldController chosenField];
         newField = [newField fieldName];
         
@@ -1688,7 +1688,7 @@
         [alert setInformativeText:NSLocalizedString(@"Do you want me to 
autofill information from the text? This may overwrite fields that are already 
set.", @"Informative text in alert dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertFirstButtonReturn)
                 [self autoDiscoverFromStringWithPublication:[pubs 
firstObject]];
         }];

Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m  2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m  2025-12-02 15:57:07 UTC (rev 29932)
@@ -368,7 +368,7 @@
         [alert setInformativeText:NSLocalizedString(@"Changing the default 
bibtex types and fields can give misleading information.", @"Informative text 
in alert dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
-        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse returnCode){
             [self doChangeCanEditDefaultTypes:returnCode == 
NSAlertFirstButtonReturn];
         }];
        } else {

Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2025-12-02 15:57:07 UTC (rev 
29932)
@@ -91,7 +91,7 @@
     [oPanel setResolvesAliases:NO];
     [oPanel setPrompt:NSLocalizedString(@"Choose", @"Prompt for Choose 
panel")];
     
-    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [oPanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSURL *url = [[oPanel URLs] firstObject];
             [self setUrlString:[url absoluteString]];

Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2025-12-02 15:57:07 UTC (rev 29932)
@@ -130,7 +130,7 @@
     NSString *name = [[[self document] documentURL] lastPathComponent];
     NSSavePanel *savePanel = [NSSavePanel savePanel];
     [savePanel setNameFieldStringValue:name ?: 
NSLocalizedString(@"Untitled.pdf", @"Default file name for saved PDF")];
-    [savePanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSInteger result){
+    [savePanel beginSheetModalForWindow:[self window] 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             // -[PDFDocument writeToURL:] returns YES even if you don't have 
write permission, so we'll use NSData rdar://problem/4475062
             NSError *error = nil;

Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibDocument.m 2025-12-02 15:57:07 UTC (rev 29932)
@@ -305,7 +305,7 @@
             if (NSAlertFirstButtonReturn == returnCode)
                 [self migrateFiles:self];
         } else {
-            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
                 if ([[alert suppressionButton] state] == NSControlStateValueOn)
                     [[NSUserDefaults standardUserDefaults] setBool:YES 
forKey:BDSKDisableMigrationWarningKey];
                 if (NSAlertFirstButtonReturn == returnCode)
@@ -1286,7 +1286,7 @@
     [alert addButtonWithTitle:NSLocalizedString(@"Generate", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Don't Generate", @"Button 
title")];
     if ([documentWindow attachedSheet] == nil) {
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertFirstButtonReturn)
                 [self generateForTemporaryCiteKey:tmpKey];
         }];

Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibDocument_Actions.m 2025-12-02 15:57:07 UTC (rev 29932)
@@ -234,7 +234,7 @@
             [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button 
title")];
             [alert setShowsSuppressionButton:YES];
             // use didDismissSelector because the action may pop up its own 
sheet
-            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
                 if ([[alert suppressionButton]state] == NSControlStateValueOn)
                     [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKWarnOnRemovalFromGroupKey];
                 if (returnCode == NSAlertFirstButtonReturn)
@@ -307,7 +307,7 @@
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
                [alert setShowsSuppressionButton:YES];
         // use didDismissSelector because the action may pop up its own sheet
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if ([[alert suppressionButton] state] == NSControlStateValueOn)
                 [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKWarnOnDeleteKey];
             if (returnCode == NSAlertFirstButtonReturn)
@@ -366,7 +366,7 @@
         [alert setInformativeText:[NSString 
stringWithFormat:NSLocalizedString(@"BibDesk is about to open %ld editor 
windows.  Is this really what you want?" , @"Informative text in alert 
dialog"), (long)n]];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertSecondButtonReturn) {
                 for (BibItem *pub in pubs)
                     [self editPub:pub];
@@ -821,7 +821,7 @@
         [alert setInformativeText:[NSString 
stringWithFormat:NSLocalizedString(@"BibDesk is about to open %ld linked files. 
Do you want to proceed?" , @"Informative text in alert dialog"), (long)n]];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Open", @"Button title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertSecondButtonReturn)
                 [self openLinkedFiles:fileURLs];
         }];
@@ -856,7 +856,7 @@
         [alert setInformativeText:[NSString 
stringWithFormat:NSLocalizedString(@"BibDesk is about to reveal %ld linked 
files. Do you want to proceed?" , @"Informative text in alert dialog"), 
(long)n]];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Reveal", @"Button 
title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertSecondButtonReturn)
                 [self revealLinkedFiles:fileURLs];
         }];
@@ -894,7 +894,7 @@
         [alert setInformativeText:[NSString 
stringWithFormat:NSLocalizedString(@"BibDesk is about to open %ld URLs. Do you 
want to proceed?" , @"Informative text in alert dialog"), (long)n]];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Open", @"Button title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if(returnCode == NSAlertSecondButtonReturn)
                 [self openLinkedURLs:URLs];
         }];
@@ -935,7 +935,7 @@
         [alert setInformativeText:[NSString 
stringWithFormat:NSLocalizedString(@"BibDesk is about to open windows for notes 
for %ld linked files. Do you want to proceed?" , @"Informative text in alert 
dialog"), (long)n]];
         [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Open", @"Button title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode == NSAlertSecondButtonReturn)
                 [self showNotesForLinkedFiles:fileURLs];
         }];
@@ -1032,7 +1032,7 @@
         [oPanel setAccessoryView:disableAutoFileButton];
        }
     
-    [oPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [oPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSURL *aURL = [[oPanel URLs] objectAtIndex:0];
             BOOL shouldAutoFile = [(NSButton *)[oPanel accessoryView] state] 
== NSControlStateValueOff && [[NSUserDefaults standardUserDefaults] 
boolForKey:BDSKFilePapersAutomaticallyKey];
@@ -1073,7 +1073,7 @@
     BDSKURLSheetController *urlController = [[BDSKURLSheetController alloc] 
init];
     
     [urlController setUrlString:urlString];
-    [urlController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [urlController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             BibItem *publication = [self singleSelectedPublication];
             if (publication == nil) {
@@ -1133,7 +1133,7 @@
             [alert setInformativeText:NSLocalizedString(@"Downloading will 
overwrite the current value of the Local-Url field. Do you want to proceed?", 
@"Informative text in alert dialog")];
             [alert addButtonWithTitle:NSLocalizedString(@"Download", @"Button 
title")];
             [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
-            [alert beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSModalResponse returnCode){
                 if (returnCode == NSAlertFirstButtonReturn)
                     [pub downloadURLForField:BDSKUrlString 
options:BDSKDownloadDefault];
             }];
@@ -1306,7 +1306,7 @@
 - (IBAction)showDocumentInfoWindow:(id)sender{
     BDSKDocumentInfoWindowController *infoController = 
[[BDSKDocumentInfoWindowController alloc] init];
     [infoController setInfo:[self documentInfo]];
-    [infoController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [infoController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSMapTable *info = [infoController info];
             if ([info isEqual:[self documentInfo]] == NO) {
@@ -1364,7 +1364,7 @@
     }
     
     BDSKTextImportController *tic = [(BDSKTextImportController 
*)[BDSKTextImportController alloc] initForOwner:self];
-    [tic beginSheetForURL:nil modalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [tic beginSheetForURL:nil modalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         NSArray *addedPubs = [tic addedPublications];
         if ([addedPubs count] > 0)
             [self importPublications:addedPubs options:BDSKImportSelectLibrary 
| BDSKImportNoEdit];
@@ -1376,7 +1376,7 @@
        [oPanel setAllowsMultipleSelection:NO];
        [oPanel setCanChooseDirectories:NO];
 
-       [oPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+       [oPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSURL *fileURL = [oPanel URL];
             // first try to parse the file
@@ -1392,7 +1392,7 @@
                 [oPanel orderOut:nil];
                 
                 BDSKTextImportController *tic = [(BDSKTextImportController 
*)[BDSKTextImportController alloc] initForOwner:self];
-                [tic beginSheetForURL:fileURL modalForWindow:documentWindow  
completionHandler:^(NSInteger result2){
+                [tic beginSheetForURL:fileURL modalForWindow:documentWindow  
completionHandler:^(NSModalResponse result2){
                     NSArray *addedPubs = [tic addedPublications];
                     if ([addedPubs count] > 0)
                         [self importPublications:addedPubs 
options:BDSKImportSelectLibrary | BDSKImportNoEdit];
@@ -1405,7 +1405,7 @@
 - (IBAction)importFromWebAction:(id)sender{
     BDSKURLSheetController *urlSheetController = [[BDSKURLSheetController 
alloc] init];
     
-       [urlSheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+       [urlSheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             [[urlSheetController window] orderOut:nil];
             
@@ -1416,7 +1416,7 @@
             }
             
             BDSKTextImportController *tic = [(BDSKTextImportController 
*)[BDSKTextImportController alloc] initForOwner:self];
-            [tic beginSheetForURL:url modalForWindow:documentWindow 
completionHandler:^(NSInteger result2){
+            [tic beginSheetForURL:url modalForWindow:documentWindow 
completionHandler:^(NSModalResponse result2){
                 NSArray *addedPubs = [tic addedPublications];
                 if ([addedPubs count] > 0)
                     [self importPublications:addedPubs 
options:BDSKImportSelectLibrary | BDSKImportNoEdit];
@@ -1545,7 +1545,7 @@
         [alert addButtonWithTitle:NSLocalizedString(@"Generate", @"Button 
title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
         [alert setShowsSuppressionButton:YES];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if([[alert suppressionButton] state] == NSControlStateValueOn)
                 [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKWarnOnCiteKeyChangeKey];
             if (returnCode == NSAlertFirstButtonReturn)
@@ -1634,7 +1634,7 @@
     [alert setInformativeText:NSLocalizedString(@"Do you want me to overwrite 
the Booktitle field when it was already entered?", @"Informative text in alert 
dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"Don't Overwrite", @"Button 
title: overwrite Booktitle")];
     [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"Button title: 
don't overwrite Booktitle")];
-    [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
         if ([self commitPendingEdits]) {
             BOOL overwrite = (returnCode == NSAlertSecondButtonReturn);
             NSSet *parentTypes = [NSSet setWithArray:[[NSUserDefaults 
standardUserDefaults] arrayForKey:BDSKTypesForDuplicateBooktitleKey]];
@@ -1762,7 +1762,7 @@
         [alert addButtonWithTitle:NSLocalizedString(@"All Candidates", 
@"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Only Duplicates", 
@"Button title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
-        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode != NSAlertThirdButtonReturn)
                 [self selectDuplicatesForAll:returnCode == 
NSAlertFirstButtonReturn];
         }];
@@ -1807,7 +1807,7 @@
     NSOpenPanel *openPanel = [NSOpenPanel openPanel];
     [openPanel setPrompt:NSLocalizedString(@"Choose", @"")];
     [openPanel setAllowedFileTypes:@[@"aux"]];
-    [openPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [openPanel beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSURL *fileURL = [openPanel URL];
             if (fileURL)

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m      2025-12-02 10:26:06 UTC (rev 
29931)
+++ trunk/bibdesk/BibDocument_DataSource.m      2025-12-02 15:57:07 UTC (rev 
29932)
@@ -1681,7 +1681,7 @@
             [alert addButtonWithTitle:NSLocalizedString(@"No", @"Button 
title")];
             [alert addButtonWithTitle:NSLocalizedString(@"Yes", @"Button 
title")];
             [alert setShowsSuppressionButton:YES];
-            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse returnCode){
                 if ([[alert suppressionButton] state] == NSControlStateValueOn)
                     [[NSUserDefaults standardUserDefaults] setBool:NO 
forKey:BDSKAskToTrashFilesKey];
                 if (returnCode == NSAlertSecondButtonReturn)

Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m  2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibDocument_Groups.m  2025-12-02 15:57:07 UTC (rev 29932)
@@ -812,7 +812,7 @@
     
     BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController 
fieldSheetControllerWithChoosableFields:colNames
                                                                              
label:NSLocalizedString(@"Name of group field:", @"Label for adding group 
field")];
-       [addFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+       [addFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         NSString *newGroupField = [addFieldController chosenField];
         if(result == NSModalResponseCancel || newGroupField == nil)
             return; // the user canceled
@@ -842,7 +842,7 @@
        NSArray *groupFields = [[NSUserDefaults standardUserDefaults] 
stringArrayForKey:BDSKGroupFieldsKey];
     BDSKFieldSheetController *removeFieldController = 
[BDSKFieldSheetController fieldSheetControllerWithSelectableFields:groupFields
                                                                                
 label:NSLocalizedString(@"Group field to remove:", @"Label for removing group 
field")];
-       [removeFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+       [removeFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         NSString *oldGroupField = [removeFieldController selectedField];
         if(result == NSModalResponseCancel || [NSString 
isEmptyString:oldGroupField])
             return;
@@ -879,7 +879,7 @@
 
 - (IBAction)addSmartGroupAction:(id)sender {
        BDSKFilterController *filterController = [[BDSKFilterController alloc] 
init];
-    [filterController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [filterController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             BDSKFilter *filter = [[BDSKFilter alloc] 
initWithConditions:[filterController conditions] conjunction:[filterController 
conjunction]];
             BDSKSmartGroup *group = [[BDSKSmartGroup alloc] 
initWithFilter:filter];
@@ -910,7 +910,7 @@
 
 - (IBAction)addSearchGroupAction:(id)sender {
     BDSKSearchGroupSheetController *sheetController = 
[[BDSKSearchGroupSheetController alloc] init];
-    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             BDSKSearchGroup *group = [[BDSKSearchGroup alloc] 
initWithServerInfo:[sheetController serverInfo] searchTerm:nil];
             [groups addChildGroup:group];
@@ -963,7 +963,7 @@
     [self addMenuItemsForBookmarks:@[bookmark] level:0 toMenu:[folderPopUp 
menu]];
     [folderPopUp selectItemAtIndex:0];
     
-    [bookmarkSheetController beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSInteger result){
+    [bookmarkSheetController beginSheetModalForWindow:[self windowForSheet] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             BDSKSearchBookmark *newBookmark = [[BDSKSearchBookmark alloc] 
initWithInfo:[group dictionaryValue] label:[bookmarkSheetController 
stringValue]];
             if (newBookmark) {
@@ -976,7 +976,7 @@
 
 - (IBAction)addURLGroupAction:(id)sender {
     BDSKURLGroupSheetController *sheetController = 
[[BDSKURLGroupSheetController alloc] init];
-    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             BDSKURLGroup *group = [[BDSKURLGroup alloc] 
initWithURL:[sheetController URL]];
             [groups addChildGroup:group];
@@ -990,7 +990,7 @@
 
 - (IBAction)addScriptGroupAction:(id)sender {
     BDSKScriptGroupSheetController *sheetController = 
[[BDSKScriptGroupSheetController alloc] init];
-    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         if(result == NSModalResponseOK){
             BDSKScriptGroup *group = [[BDSKScriptGroup alloc] 
initWithScriptPath:[sheetController path] scriptArguments:[sheetController 
arguments]];
             [groups addChildGroup:group];
@@ -1030,7 +1030,7 @@
        if ([group groupType] == BDSKSmartGroupType) {
                BDSKFilter *filter = [(BDSKSmartGroup *)group filter];
                BDSKFilterController *filterController = [[BDSKFilterController 
alloc] initWithFilter:filter];
-        [filterController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+        [filterController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 [filter setConditions:[filterController conditions]];
                 [filter setConjunction:[filterController conjunction]];
@@ -1045,7 +1045,7 @@
        } else if ([group groupType] == BDSKURLGroupType) {
         BDSKURLGroup *urlGroup = (BDSKURLGroup *)group;
         BDSKURLGroupSheetController *sheetController = 
[(BDSKURLGroupSheetController *)[BDSKURLGroupSheetController alloc] 
initWithURL:[urlGroup URL]];
-        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 [urlGroup setURL:[sheetController URL]];
                 [[self undoManager] setActionName:NSLocalizedString(@"Edit 
External File Group", @"Undo action name")];
@@ -1054,7 +1054,7 @@
        } else if ([group groupType] == BDSKScriptGroupType) {
         BDSKScriptGroup *scriptGroup = (BDSKScriptGroup *)group;
         BDSKScriptGroupSheetController *sheetController = 
[(BDSKScriptGroupSheetController *)[BDSKScriptGroupSheetController alloc] 
initWithPath:[scriptGroup scriptPath] arguments:[scriptGroup scriptArguments]];
-        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 NSString *path = [sheetController path];
                 [scriptGroup setScriptPath:path];
@@ -1066,7 +1066,7 @@
        } else if ([group groupType] == BDSKSearchGroupType) {
         BDSKSearchGroup *searchGroup = (BDSKSearchGroup *)group;
         BDSKSearchGroupSheetController *sheetController = 
[(BDSKSearchGroupSheetController *)[BDSKSearchGroupSheetController alloc] 
initWithServerInfo:[searchGroup serverInfo]];
-        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+        [sheetController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 [searchGroup setServerInfo:[sheetController serverInfo]];
             }
@@ -1242,7 +1242,7 @@
         BDSKFieldSheetController *chooseFieldController = 
[BDSKFieldSheetController 
fieldSheetControllerWithSelectableFields:currentGroupFields
                                                                                
     label:NSLocalizedString(@"Group field:", @"Label for choosing group 
field")];
         [chooseFieldController 
setDefaultButtonTitle:NSLocalizedString(@"Choose", @"Button title")];
-        [chooseFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+        [chooseFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
             NSString *groupField = [chooseFieldController selectedField];
             if(result == NSModalResponseCancel || [NSString 
isEmptyString:groupField])
                 return;

Modified: trunk/bibdesk/BibDocument_Search.m
===================================================================
--- trunk/bibdesk/BibDocument_Search.m  2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibDocument_Search.m  2025-12-02 15:57:07 UTC (rev 29932)
@@ -243,7 +243,7 @@
     }
     NSArray *fields = [btm allFieldNamesIncluding:included excluding:excluded];
     BDSKFieldSheetController *addFieldController = [BDSKFieldSheetController 
fieldSheetControllerWithChoosableFields:fields label:NSLocalizedString(@"Search 
field to add:", @"Label for adding search field")];
-    [addFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [addFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         NSString *fieldToAdd = [addFieldController chosenField];
         if (result == NSModalResponseCancel || [NSString 
isEmptyString:fieldToAdd] || [excluded containsObject:fieldToAdd])
             return;
@@ -276,7 +276,7 @@
     if ([fields count] == 0)
         return;
     BDSKFieldSheetController *removeFieldController = 
[BDSKFieldSheetController fieldSheetControllerWithSelectableFields:fields 
label:NSLocalizedString(@"Search field to remove:", @"Label for removing search 
field")];
-    [removeFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSInteger result){
+    [removeFieldController beginSheetModalForWindow:documentWindow 
completionHandler:^(NSModalResponse result){
         NSString *fieldToRemove = [removeFieldController selectedField];
         if (result == NSModalResponseOK) {
             for (NSButton *button in [searchButtonBar buttons]) {

Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m    2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_AutoFile.m    2025-12-02 15:57:07 UTC (rev 29932)
@@ -129,7 +129,7 @@
        [openPanel setCanCreateDirectories:YES];
        [openPanel setResolvesAliases:NO];
     [openPanel setPrompt:NSLocalizedString(@"Choose", @"Prompt for Choose 
panel")];
-    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSString *path = [[[openPanel URLs] objectAtIndex:0] path];
             [sud setObject:[path stringByAbbreviatingWithTildeInPath] 
forKey:BDSKPapersFolderPathKey];
@@ -294,7 +294,7 @@
         if (currentIsValid)
             [alert addButtonWithTitle:NSLocalizedString(@"Revert to Last", 
@"Button title")];
         [[alert addButtonWithTitle:NSLocalizedString(@"Revert to Default", 
@"Button title")] setTag:NSAlertThirdButtonReturn];
-        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode != NSAlertFirstButtonReturn) {
                 if (returnCode == NSAlertThirdButtonReturn) {
                     NSString *defaultFormatString = 
[[[NSUserDefaultsController sharedUserDefaultsController] initialValues] 
objectForKey:BDSKLocalFileFormatKey];

Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m     2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_CiteKey.m     2025-12-02 15:57:07 UTC (rev 29932)
@@ -243,7 +243,7 @@
         if (currentIsValid)
             [alert addButtonWithTitle:NSLocalizedString(@"Revert to Last", 
@"Button title")];
         [[alert addButtonWithTitle:NSLocalizedString(@"Revert to Default", 
@"Button title")] setTag:NSAlertThirdButtonReturn];
-        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
             if (returnCode != NSAlertFirstButtonReturn) {
                 if (returnCode == NSAlertThirdButtonReturn){
                     NSString *defaultFormatString = 
[[[NSUserDefaultsController sharedUserDefaultsController] initialValues] 
objectForKey:BDSKCiteKeyFormatKey];

Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m    2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_Defaults.m    2025-12-02 15:57:07 UTC (rev 29932)
@@ -637,7 +637,7 @@
         [openPanel setPrompt:NSLocalizedString(@"Choose Viewer", @"Prompt for 
Choose panel")];
         [openPanel setDirectoryURL:[[NSFileManager defaultManager] 
applicationsDirectoryURL]];
         [openPanel setAllowedFileTypes:@[(__bridge NSString 
*)kUTTypeApplicationBundle]];
-        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
             NSString *bundleID;
             if (result == NSModalResponseOK)
                 bundleID = [[NSBundle bundleWithURL:[openPanel URL]] 
bundleIdentifier];
@@ -698,7 +698,7 @@
         [openPanel setCanChooseFiles:NO];
         [openPanel setPrompt:NSLocalizedString(@"Select", @"Button title")];
         [openPanel setDirectoryURL:[NSURL fileURLWithPath:downloadsFolder 
isDirectory:YES]];
-        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
                 if (result == NSModalResponseOK) {
                     if([[[openPanel URL] path] 
isEqualToString:defaultDownloadsFolder])
                         [[NSUserDefaults standardUserDefaults] 
removeObjectForKey:BDSKDownloadsDirectoryKey];
@@ -739,7 +739,7 @@
         [openPanel setDirectoryURL:[NSURL fileURLWithPath:@"/usr" 
isDirectory:YES]];
         [openPanel setAllowedFileTypes:@[@"bib", @"bst"]];
         
-        [openPanel beginSheetModalForWindow:globalMacroFileSheet 
completionHandler:^(NSInteger result){
+        [openPanel beginSheetModalForWindow:globalMacroFileSheet 
completionHandler:^(NSModalResponse result){
             if(result == NSModalResponseCancel)
                 return;
             

Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m      2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_Export.m      2025-12-02 15:57:07 UTC (rev 29932)
@@ -136,7 +136,7 @@
        [alert setInformativeText:NSLocalizedString(@"Choosing Reset Default 
Files will restore the original content of all the standard export and service 
template files.", @"Informative text in alert dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
         if (NSAlertFirstButtonReturn == returnCode)
             [[NSFileManager defaultManager] 
copyFileFromSharedSupportToApplicationSupport:@"Templates" overwrite:YES];
     }];
@@ -438,7 +438,7 @@
                 [chooseMainPagePopup addItemsWithTitles:[fileURLs 
valueForKey:@"lastPathComponent"]];
                 [chooseMainPagePopup selectItemAtIndex:0];
                 
-                [[[self view] window] beginSheet:chooseMainPageSheet 
completionHandler:^(NSInteger result){
+                [[[self view] window] beginSheet:chooseMainPageSheet 
completionHandler:^(NSModalResponse result){
                     if (result == NSModalResponseCancel)
                         return;
                     
@@ -590,7 +590,7 @@
     // start the panel in the same directory as the item's existing path (may 
be nil)
     [openPanel setDirectoryURL:[[item representedFileURLNoUI] 
URLByDeletingLastPathComponent]];
     
-    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
         NSURL *fileURL = [[openPanel URLs] lastObject];
         if(NSModalResponseOK == result && nil != fileURL){
             // this will set the name property

Modified: trunk/bibdesk/BibPref_Files.m
===================================================================
--- trunk/bibdesk/BibPref_Files.m       2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_Files.m       2025-12-02 15:57:07 UTC (rev 29932)
@@ -97,7 +97,7 @@
        [alert setInformativeText:NSLocalizedString(@"Choosing Reset will 
restore the original content of the template file.", @"Informative text in 
alert dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn)
             // copy template.txt file from the bundle
             [[NSFileManager defaultManager] 
copyFileFromSharedSupportToApplicationSupport :@"template.txt" overwrite:YES];
@@ -114,7 +114,7 @@
        [alert setInformativeText:NSLocalizedString(@"Choosing Reset will erase 
all custom character conversions.", @"Informative text in alert dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn) {
             NSFileManager *fileManager = [NSFileManager defaultManager];
             NSURL *conversionsFileURL = [[fileManager 
applicationSupportDirectoryURL] 
URLByAppendingPathComponent:CHARACTER_CONVERSION_FILENAME isDirectory:NO];
@@ -143,7 +143,7 @@
             [alert addButtonWithTitle:NSLocalizedString(@"Restart", @"Button 
title")];
             [alert addButtonWithTitle:NSLocalizedString(@"Continue", @"Button 
title")];
             if ([[[self view] window] isVisible]) {
-                [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+                [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
                     if (returnCode == NSAlertFirstButtonReturn)
                         [NSApp relaunch];
                 }];

Modified: trunk/bibdesk/BibPref_General.m
===================================================================
--- trunk/bibdesk/BibPref_General.m     2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_General.m     2025-12-02 15:57:07 UTC (rev 29932)
@@ -139,7 +139,7 @@
     [openPanel setCanChooseDirectories:NO];
     [openPanel setAllowsMultipleSelection:NO];
     [openPanel setAllowedFileTypes:@[@"bib"]];
-    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+    [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
         if (result == NSModalResponseOK) {
             NSData *data = [[openPanel URL] bookmarkDataWithOptions:0 
includingResourceValuesForKeys:nil relativeToURL:nil error:NULL];
             if (data) {

Modified: trunk/bibdesk/BibPref_ScriptHooks.m
===================================================================
--- trunk/bibdesk/BibPref_ScriptHooks.m 2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_ScriptHooks.m 2025-12-02 15:57:07 UTC (rev 29932)
@@ -195,7 +195,7 @@
         [openPanel setDirectoryURL:directoryURL];
         [openPanel setAccessoryView:view];
         [openPanel setAccessoryViewDisclosed:YES];
-        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger result){
+        [openPanel beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse result){
             if (result == NSModalResponseOK) {
                 NSString *path = [[openPanel URL] path];
                 if (path)

Modified: trunk/bibdesk/BibPref_TeX.m
===================================================================
--- trunk/bibdesk/BibPref_TeX.m 2025-12-02 10:26:06 UTC (rev 29931)
+++ trunk/bibdesk/BibPref_TeX.m 2025-12-02 15:57:07 UTC (rev 29932)
@@ -123,7 +123,7 @@
             // for the help delegate method
             [alert setShowsHelp:YES];
             [alert setDelegate:self];
-            [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+            [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
                 if (NSAlertFirstButtonReturn == returnCode) {
                     [sud setObject:newStyle forKey:BDSKBibTeXStyleKey];
                 } else if (NSAlertSecondButtonReturn == returnCode) {
@@ -153,7 +153,7 @@
         [alert setInformativeText:NSLocalizedString(@"The system was unable to 
find an application to open the TeX template file.  Choose \"Reveal\" to show 
the template in the Finder.", @"Informative text in alert dialog")];
         [alert addButtonWithTitle:NSLocalizedString(@"Reveal", @"Button 
title")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button 
title")];
-        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+        [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
             if(returnCode == NSAlertFirstButtonReturn)
                 [[NSWorkspace sharedWorkspace] 
activateFileViewerSelectingURLs:@[fileURL]];
         }];
@@ -166,7 +166,7 @@
        [alert setInformativeText:NSLocalizedString(@"Choosing Reset will 
revert the TeX template file to its original content.", @"Informative text in 
alert dialog")];
     [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
-    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSInteger returnCode){
+    [alert beginSheetModalForWindow:[[self view] window] 
completionHandler:^(NSModalResponse returnCode){
         if (returnCode == NSAlertFirstButtonReturn)
             // copy previewtemplate.tex file from the bundle
             [[NSFileManager defaultManager] 
copyFileFromSharedSupportToApplicationSupport:@"previewtemplate.tex" 
overwrite:YES];

Modified: trunk/bibdesk/NSWindowController_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSWindowController_BDSKExtensions.h   2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/NSWindowController_BDSKExtensions.h   2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -49,7 +49,7 @@
 - (void)setWindowFrameAutosaveNameOrCascade:(NSString *)name;
 - (void)setWindowFrameAutosaveNameOrCascade:(NSString *)name 
setFrame:(NSRect)frameRect;
 
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void (^ 
_Nullable)(NSInteger result))handler;
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void (^ 
_Nullable)(NSModalResponse result))handler;
 
 - (IBAction)dismiss:(nullable id)sender;
 

Modified: trunk/bibdesk/NSWindowController_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSWindowController_BDSKExtensions.m   2025-12-02 10:26:06 UTC 
(rev 29931)
+++ trunk/bibdesk/NSWindowController_BDSKExtensions.m   2025-12-02 15:57:07 UTC 
(rev 29932)
@@ -93,7 +93,7 @@
 
 #pragma mark Sheet methods
 
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void 
(^)(NSModalResponse result))handler {
     [window beginSheet:[self window] completionHandler:^(NSModalResponse 
result){
         if (handler)
             handler(result);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to