Revision: 25118
http://sourceforge.net/p/bibdesk/svn/25118
Author: hofman
Date: 2020-12-02 16:08:34 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Remove declarations and fallback implementation for 10.8-
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKCharacterConversion.m
trunk/bibdesk/BDSKCustomCiteDrawerController.m
trunk/bibdesk/BDSKDocumentInfoWindowController.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKFileContentSearchController.m
trunk/bibdesk/BDSKFilerErrorController.m
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKPreferenceController.m
trunk/bibdesk/BDSKPreviewer.m
trunk/bibdesk/BDSKReadMeController.m
trunk/bibdesk/BDSKScriptGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupViewController.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTypeInfoEditor.m
trunk/bibdesk/BDSKURLGroupSheetController.m
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/BibPref_AutoFile.m
trunk/bibdesk/BibPref_Cite.m
trunk/bibdesk/BibPref_CiteKey.m
trunk/bibdesk/BibPref_Defaults.m
trunk/bibdesk/BibPref_Files.m
trunk/bibdesk/BibPref_TeX.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk/NSWindowController_BDSKExtensions.m
Removed Paths:
-------------
trunk/bibdesk/NSAlert_BDSKExtensions.h
trunk/bibdesk/NSAlert_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKBookmarkController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -50,7 +50,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "NSURL_BDSKExtensions.h"
#import "NSPasteboard_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKBookmarksWindowFrameAutosaveName @"BDSKBookmarksWindow"
Modified: trunk/bibdesk/BDSKCharacterConversion.m
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKCharacterConversion.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -41,7 +41,6 @@
#import "NSFileManager_BDSKExtensions.h"
#import "NSWindowController_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKCharacterConversionFrameAutosaveName @"BDSKCharacterConversion"
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.m
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -41,7 +41,6 @@
#import "BibDocument_Groups.h"
#import "NSTableView_BDSKExtensions.h"
#import "BDSKTableView.h"
-#import "NSAlert_BDSKExtensions.h"
@implementation BDSKCustomCiteDrawerController
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.m
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -41,7 +41,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKTouchBarItemIdentifierButtons
@"edu.ucsd.mmccrack.bibdesk.touchbar-item.buttons"
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BDSKEditor.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -90,7 +90,6 @@
#import "NSError_BDSKExtensions.h"
#import "NSPasteboard_BDSKExtensions.h"
#import "BDSKItemDownload.h"
-#import "NSAlert_BDSKExtensions.h"
#define WEAK_NULL NULL
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -56,7 +56,6 @@
#import "BDSKPublicationsArray.h"
#import "BDSKTableView.h"
#import "NSTableView_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
@implementation BDSKFileContentSearchController
Modified: trunk/bibdesk/BDSKFilerErrorController.m
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKFilerErrorController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -45,7 +45,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "BDSKPathColorTransformer.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKOldPathColorTransformerName @"BDSKOldPathColorTransformer"
#define BDSKNewPathColorTransformerName @"BDSKNewPathColorTransformer"
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -55,7 +55,6 @@
#import "NSPasteboard_BDSKExtensions.h"
#import "BDSKTypeManager.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKMacroWindowFrameAutosaveName @"BDSKMacroWindow"
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -59,7 +59,6 @@
#import "BDSKFilePathCell.h"
#import "NSEvent_BDSKExtensions.h"
#import "NSView_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKOrphanedFilesWindowFrameAutosaveName @"BDSKOrphanedFilesWindow"
Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKPreferenceController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -42,7 +42,6 @@
#import "BDSKPreferenceIconView.h"
#import <Sparkle/Sparkle.h>
#import "NSAnimationContext_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKPreferencesWindowFrameAutosaveName @"BDSKPreferencesWindow"
Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BDSKPreviewer.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -51,7 +51,6 @@
#import "NSPrintOperation_BDSKExtensions.h"
#import "BDSKPreferenceController.h"
#import "NSGeometry_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#import "NSColor_BDSKExtensions.h"
#define BDSKPreviewPanelFrameAutosaveName @"BDSKPreviewPanel"
Modified: trunk/bibdesk/BDSKReadMeController.m
===================================================================
--- trunk/bibdesk/BDSKReadMeController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKReadMeController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -39,7 +39,6 @@
#import "BDSKReadMeController.h"
#import "NSWorkspace_BDSKExtensions.h"
#import "NSGeometry_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#include <sys/utsname.h>
#define BDSKReadMeWindowFrameAutosaveName @"BDSKReadMeWindow"
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -44,7 +44,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "NSPasteboard_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKTouchBarItemIdentifierButtons
@"edu.ucsd.mmccrack.bibdesk.touchbar-item.buttons"
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -44,7 +44,6 @@
#import "BDSKSearchGroupServerManager.h"
#import "NSWindowController_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define DEFAULT_SERVER_NAME @"PubMed"
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -39,7 +39,6 @@
#import "BDSKSearchGroupViewController.h"
#import "BDSKSearchGroup.h"
#import "BDSKEdgeView.h"
-#import "NSAlert_BDSKExtensions.h"
@implementation BDSKSearchGroupViewController
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKTextImportController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -66,7 +66,6 @@
#import "NSTextView_BDSKExtensions.h"
#import "NSError_BDSKExtensions.h"
#import "NSAttributedString_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#import "NSColor_BDSKExtensions.h"
#define BDSKTextImportControllerFrameAutosaveName @"BDSKTextImportController
Frame Autosave Name"
Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -42,7 +42,6 @@
#import "BDSKTypeManager.h"
#import "NSWindowController_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define REQUIRED_KEY @"required"
#define OPTIONAL_KEY @"optional"
Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -46,7 +46,6 @@
#import "NSURL_BDSKExtensions.h"
#import "NSPasteboard_BDSKExtensions.h"
#import "BDSKTouchBarButtonGroup.h"
-#import "NSAlert_BDSKExtensions.h"
#define BDSKTouchBarItemIdentifierButtons
@"edu.ucsd.mmccrack.bibdesk.touchbar-item.buttons"
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibDocument.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -129,7 +129,6 @@
#import "BDSKSaveAccessoryViewController.h"
#import "NSObject_BDSKExtensions.h"
#import "NSTouchBar_BDSKForwardDeclarations.h"
-#import "NSAlert_BDSKExtensions.h"
// these are the same as in Info.plist
NSString *BDSKBibTeXDocumentType = @"BibTeX Database";
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibDocument_Actions.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -68,7 +68,6 @@
#import "NSAttributedString_BDSKExtensions.h"
#import "NSPrintOperation_BDSKExtensions.h"
#import "NSError_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
#import "BDSKTypeManager.h"
#import "BDSKScriptHookManager.h"
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibDocument_Groups.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -92,7 +92,6 @@
#import "NSTableView_BDSKExtensions.h"
#import "NSWorkspace_BDSKExtensions.h"
#import "NSObject_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
@implementation BibDocument (Groups)
Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_AutoFile.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -45,7 +45,6 @@
#import "BDSKStringConstants.h"
#import "NSFileManager_BDSKExtensions.h"
#import "BDSKTypeManager.h"
-#import "NSAlert_BDSKExtensions.h"
#define MAX_PREVIEW_WIDTH 501.0
#define MAX_FORMAT_WIDTH 288.0
Modified: trunk/bibdesk/BibPref_Cite.m
===================================================================
--- trunk/bibdesk/BibPref_Cite.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_Cite.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -38,7 +38,6 @@
#import "BDSKTemplate.h"
#import "BibDocument.h"
#import "BDSKStringConstants.h"
-#import "NSAlert_BDSKExtensions.h"
#define MAX_PREVIEW_WIDTH 465.0
Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_CiteKey.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -45,7 +45,6 @@
#import "BDSKAppController.h"
#import "BDSKPreviewItem.h"
#import "BDSKTypeManager.h"
-#import "NSAlert_BDSKExtensions.h"
#define MAX_PREVIEW_WIDTH 481
#define MAX_FORMAT_WIDTH 266
Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_Defaults.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -49,7 +49,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
#import "NSPasteboard_BDSKExtensions.h"
-#import "NSAlert_BDSKExtensions.h"
// this corresponds with the menu item order in the nib
enum {
Modified: trunk/bibdesk/BibPref_Files.m
===================================================================
--- trunk/bibdesk/BibPref_Files.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_Files.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -47,7 +47,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "BDSKDocumentController.h"
#import "BDSKApplication.h"
-#import "NSAlert_BDSKExtensions.h"
@interface BibPref_Files (Private)
Modified: trunk/bibdesk/BibPref_TeX.m
===================================================================
--- trunk/bibdesk/BibPref_TeX.m 2020-12-02 16:02:12 UTC (rev 25117)
+++ trunk/bibdesk/BibPref_TeX.m 2020-12-02 16:08:34 UTC (rev 25118)
@@ -44,7 +44,6 @@
#import "BDSKShellCommandFormatter.h"
#import "BDSKStringConstants.h"
#import "BDSKPreferenceController.h"
-#import "NSAlert_BDSKExtensions.h"
#import "NSColor_BDSKExtensions.h"
#define BDSK_TEX_DOWNLOAD_URL @"https://tug.org/mactex/";
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -652,8 +652,6 @@
CEDD189921696373000E28D7 /* BDSKAutoFileCommand.m in Sources */
= {isa = PBXBuildFile; fileRef = CEDD188B21696373000E28D7 /*
BDSKAutoFileCommand.m */; };
CEDED0952032450B003FA44D /* BDSKIUCrParser.m in Sources */ =
{isa = PBXBuildFile; fileRef = CEDED0932032450B003FA44D /* BDSKIUCrParser.m */;
};
CEE09F1C216147E1009CE63D /* BDSKFieldInfo.m in Sources */ =
{isa = PBXBuildFile; fileRef = CEE09F1A216147E1009CE63D /* BDSKFieldInfo.m */;
};
- CEE20D9422E64F6900A422FF /* NSAlert_BDSKExtensions.h in Headers
*/ = {isa = PBXBuildFile; fileRef = CEE20D9222E64F6900A422FF /*
NSAlert_BDSKExtensions.h */; };
- CEE20D9522E64F6900A422FF /* NSAlert_BDSKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEE20D9322E64F6900A422FF /*
NSAlert_BDSKExtensions.m */; };
CEE22B210BFB7DA8002B746B /* RelNotes.rtf in Resources */ = {isa
= PBXBuildFile; fileRef = F994B8F607F5F65F00751DA1 /* RelNotes.rtf */; };
CEE23BDC0BFBA775002B746B /* Scripts in Copy Files: Shared
Support */ = {isa = PBXBuildFile; fileRef = CEE23BD50BFBA6D6002B746B /* Scripts
*/; };
CEE23BDD0BFBA781002B746B /* Templates in Copy Files: Shared
Support */ = {isa = PBXBuildFile; fileRef = CE97A3B90A28F19A00CF2DF3 /*
Templates */; };
@@ -1782,8 +1780,6 @@
CEDED0932032450B003FA44D /* BDSKIUCrParser.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
BDSKIUCrParser.m; sourceTree = "<group>"; };
CEE09F19216147E1009CE63D /* BDSKFieldInfo.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BDSKFieldInfo.h;
sourceTree = "<group>"; };
CEE09F1A216147E1009CE63D /* BDSKFieldInfo.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
BDSKFieldInfo.m; sourceTree = "<group>"; };
- CEE20D9222E64F6900A422FF /* NSAlert_BDSKExtensions.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
NSAlert_BDSKExtensions.h; sourceTree = "<group>"; };
- CEE20D9322E64F6900A422FF /* NSAlert_BDSKExtensions.m */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
NSAlert_BDSKExtensions.m; sourceTree = "<group>"; };
CEE23BD50BFBA6D6002B746B /* Scripts */ = {isa =
PBXFileReference; lastKnownFileType = folder; path = Scripts; sourceTree =
"<group>"; };
CEE50486104D662500636237 /* BDSKNotesSearchIndex.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKNotesSearchIndex.m; sourceTree = "<group>"; };
CEE50488104D664200636237 /* BDSKNotesSearchIndex.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKNotesSearchIndex.h; sourceTree = "<group>"; };
@@ -2584,7 +2580,6 @@
CE38FA7D091D210C00BCB69D /* AppKit Extensions */ = {
isa = PBXGroup;
children = (
- CEE20D9322E64F6900A422FF /*
NSAlert_BDSKExtensions.m */,
CED76E2C1A17CCC000D1ACA4 /*
NSAnimationContext_BDSKExtensions.m */,
F97BF0B8090AE7520063504B /*
NSBezierPath_BDSKExtensions.m */,
CEF2EEE50F3462A900A7989E /*
NSColor_BDSKExtensions.m */,
@@ -3272,7 +3267,6 @@
F9025F2E0969D66F008A551C /*
CFString_BDSKExtensions.h */,
CE4476D92128907100DF38E1 /*
DOMNode_BDSKExtensions.h */,
F9022C9B0758038000C3F701 /* html2tex.h */,
- CEE20D9222E64F6900A422FF /*
NSAlert_BDSKExtensions.h */,
CED76E2B1A17CCC000D1ACA4 /*
NSAnimationContext_BDSKExtensions.h */,
CE3011B70D5CC4D100C0B7FA /*
NSAppleEventDescriptor_BDSKExtensions.h */,
F99BC25C095A5C7000E018C3 /*
NSArray_BDSKExtensions.h */,
@@ -3641,7 +3635,6 @@
CE2A0A7822459A3100A8F31C /* BDSKSplitView.h in
Headers */,
CE2A09DC224599B300A8F31C /* BDSKConverter.h in
Headers */,
CE2A0A2C224599EF00A8F31C /* BDSKMainTableView.h
in Headers */,
- CEE20D9422E64F6900A422FF /*
NSAlert_BDSKExtensions.h in Headers */,
CE2A0AC522459A4B00A8F31C /*
NSArray_BDSKExtensions.h in Headers */,
CE2A0ABB22459A4500A8F31C /* BibPref_Files.h in
Headers */,
CE2A09FD224599E100A8F31C /* BDSKFilePathCell.h
in Headers */,
@@ -4333,7 +4326,6 @@
F92F4E4F0788DEFC001B8F82 /* BibPref_Files.m in
Sources */,
2730077E07CF20B500F2E485 /*
BDSKBorderlessKeyWindow.m in Sources */,
2730077F07CF20B500F2E485 /* BDSKComplexString.m
in Sources */,
- CEE20D9522E64F6900A422FF /*
NSAlert_BDSKExtensions.m in Sources */,
2730078107CF20B500F2E485 /*
BDSKComplexStringEditor.m in Sources */,
2730078307CF20B500F2E485 /*
BDSKMacroWindowController.m in Sources */,
3D824AA907D099C300FB2F67 /*
BDSKBackgroundView.m in Sources */,
Deleted: trunk/bibdesk/NSAlert_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSAlert_BDSKExtensions.h 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/NSAlert_BDSKExtensions.h 2020-12-02 16:08:34 UTC (rev
25118)
@@ -1,48 +0,0 @@
-//
-// NSAlert_BDSKExtensions.h
-// BibDesk
-//
-// Created by Christiaan Hofman on 22/07/2019.
-/*
- This software is Copyright (c) 2019-2020
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-#if SDK_BEFORE(10_9)
-@interface NSAlert (BDSKMavericksDeclarations)
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler;
-@end
-#endif
-
-@interface NSAlert (BDSKExtensions)
-@end
Deleted: trunk/bibdesk/NSAlert_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSAlert_BDSKExtensions.m 2020-12-02 16:02:12 UTC (rev
25117)
+++ trunk/bibdesk/NSAlert_BDSKExtensions.m 2020-12-02 16:08:34 UTC (rev
25118)
@@ -1,63 +0,0 @@
-//
-// NSAlert_BDSKExtensions.m
-// BibDesk
-//
-// Created by Christiaan Hofman on 22/07/2019.
-/*
- This software is Copyright (c) 2019-2020
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "NSAlert_BDSKExtensions.h"
-#import "BDSKRuntime.h"
-
-@implementation NSAlert (BDSKExtensions)
-
-- (void)didEndAlert:(NSAlert *)alert returnCode:(NSInteger)returnCode
completionHandler:(void *)contextInfo {
- if (contextInfo != NULL) {
- void (^handler)(NSInteger) = (void(^)(NSInteger))contextInfo;
- handler(returnCode);
- Block_release(handler);
- }
-}
-
-- (void)fallback_beginSheetModalForWindow:(NSWindow *)window
completionHandler:(void (^)(NSInteger result))handler {
- [self beginSheetModalForWindow:window
- modalDelegate:handler ? self : nil
- didEndSelector:handler ?
@selector(didEndAlert:returnCode:completionHandler:) : NULL
- contextInfo:handler ? Block_copy(handler) : NULL];
-}
-
-+ (void)load {
- BDSKAddInstanceMethodImplementationFromSelector(self,
@selector(beginSheetModalForWindow:completionHandler:),
@selector(fallback_beginSheetModalForWindow:completionHandler:));
-}
-
-@end
Modified: trunk/bibdesk/NSWindowController_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSWindowController_BDSKExtensions.m 2020-12-02 16:02:12 UTC
(rev 25117)
+++ trunk/bibdesk/NSWindowController_BDSKExtensions.m 2020-12-02 16:08:34 UTC
(rev 25118)
@@ -39,14 +39,6 @@
#import "NSWindowController_BDSKExtensions.h"
#import "NSInvocation_BDSKExtensions.h"
-#if SDK_BEFORE(10_9)
-@interface NSWindow (BDSKMavericksDeclarations)
-- (void)beginSheet:(NSWindow *)sheetWindow completionHandler:(void
(^)(NSInteger returnCode))handler;
-- (void)endSheet:(NSWindow *)sheetWindow;
-- (void)endSheet:(NSWindow *)sheetWindow returnCode:(NSInteger)returnCode;
-- (NSWindow *)sheetParent;
-@end
-#endif
@implementation NSWindowController (BDSKExtensions)
@@ -101,35 +93,13 @@
#pragma mark Sheet methods
-- (void)didEndSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode
completionHandler:(void *)contextInfo {
- if (contextInfo != NULL) {
- void (^handler)(NSInteger) = (void(^)(NSInteger))contextInfo;
- handler(returnCode);
- Block_release(handler);
- }
-}
-
- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler {
[self retain]; // make sure we stay around long enough
- if ([window respondsToSelector:@selector(beginSheet:completionHandler:)]) {
- [window beginSheet:[self window] completionHandler:handler];
- } else {
- [NSApp beginSheet:[self window]
- modalForWindow:window
- modalDelegate:handler ? self : nil
- didEndSelector:handler ?
@selector(didEndSheet:returnCode:completionHandler:) : NULL
- contextInfo:handler ? Block_copy(handler) : NULL];
- }
+ [window beginSheet:[self window] completionHandler:handler];
}
- (IBAction)dismiss:(id)sender {
- if ([[self window] respondsToSelector:@selector(sheetParent)] &&
- [[self window] respondsToSelector:@selector(endSheet:returnCode:)]) {
- [[[self window] sheetParent] endSheet:[self window] returnCode:[sender
tag]];
- } else {
- [NSApp endSheet:[self window] returnCode:[sender tag]];
- [[self window] orderOut:self];
- }
+ [[[self window] sheetParent] endSheet:[self window] returnCode:[sender
tag]];
[self autorelease];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
