Revision: 28517
http://sourceforge.net/p/bibdesk/svn/28517
Author: hofman
Date: 2024-01-03 16:41:17 +0000 (Wed, 03 Jan 2024)
Log Message:
-----------
Use specific macros for SDK version checks. Declare some methods in
BDSKCompatibility.h.
Modified Paths:
--------------
trunk/bibdesk/BDSKCompatibility.h
trunk/bibdesk/BDSKEdgeView.m
trunk/bibdesk/BDSKGroupBubbleView.m
trunk/bibdesk/BDSKLevelIndicatorCell.m
trunk/bibdesk/BDSKPreferenceController.m
trunk/bibdesk/BDSKPreviewer.m
trunk/bibdesk/BDSKZoomablePDFView.m
trunk/bibdesk/NSColor_BDSKExtensions.m
trunk/bibdesk/NSImage_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKCompatibility.h
===================================================================
--- trunk/bibdesk/BDSKCompatibility.h 2024-01-03 15:55:41 UTC (rev 28516)
+++ trunk/bibdesk/BDSKCompatibility.h 2024-01-03 16:41:17 UTC (rev 28517)
@@ -38,13 +38,28 @@
#import <Cocoa/Cocoa.h>
-#define SDK_BEFORE(_version) (!defined(MAC_OS_X_VERSION_ ## _version) ||
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_ ## _version)
+#define SDK_BEFORE_10_14 (MAC_OS_X_VERSION_MAX_ALLOWED < 101400)
+#define SDK_BEFORE_10_15 (MAC_OS_X_VERSION_MAX_ALLOWED < 101500)
+#define SDK_BEFORE_11_0 (MAC_OS_X_VERSION_MAX_ALLOWED < 110000)
+#define SDK_BEFORE_12_0 (MAC_OS_X_VERSION_MAX_ALLOWED < 120000)
+#define SDK_BEFORE_13_0 (MAC_OS_X_VERSION_MAX_ALLOWED < 130000)
+#define SDK_BEFORE_14_0 (MAC_OS_X_VERSION_MAX_ALLOWED < 140000)
-#ifdef MAC_OS_VERSION_11_0
- #define MAC_OS_X_VERSION_11_0 MAC_OS_VERSION_11_0
+#if SDK_BEFORE_10_14
+
+@interface NSColor (BDSKMojaveDeclarations)
++ (NSColor *)separatorColor;
+@end
+
+@interface NSView (BDSKMojaveDeclarations)
+- (void)viewDidChangeEffectiveAppearance;
+@end
+
+#define NSAppearanceNameDarkAqua @"NSAppearanceNameDarkAqua"
+
#endif
-#if SDK_BEFORE(11_0)
+#if SDK_BEFORE_11_0
typedef NS_ENUM(NSInteger, NSTableViewStyle) {
NSTableViewStyleAutomatic,
Modified: trunk/bibdesk/BDSKEdgeView.m
===================================================================
--- trunk/bibdesk/BDSKEdgeView.m 2024-01-03 15:55:41 UTC (rev 28516)
+++ trunk/bibdesk/BDSKEdgeView.m 2024-01-03 16:41:17 UTC (rev 28517)
@@ -42,12 +42,6 @@
#define BORDER_SIZE 1.0
-#if SDK_BEFORE(10_14)
-@interface NSColor (BDSKMojaveDeclarations)
-- (NSColor *)separatorColor;
-@end
-#endif
-
#pragma mark -
@interface BDSKReflectionView : NSView {
Modified: trunk/bibdesk/BDSKGroupBubbleView.m
===================================================================
--- trunk/bibdesk/BDSKGroupBubbleView.m 2024-01-03 15:55:41 UTC (rev 28516)
+++ trunk/bibdesk/BDSKGroupBubbleView.m 2024-01-03 16:41:17 UTC (rev 28517)
@@ -39,11 +39,6 @@
#import "BDSKGroupBubbleView.h"
#import "NSColor_BDSKExtensions.h"
-#if SDK_BEFORE(10_14)
-@interface NSView (BDSKMojaveDeclarations)
-- (void)viewDidChangeEffectiveAppearance;
-@end
-#endif
@interface BDSKGroupBubbleView (BDSKPrivate)
- (void)updateMaterial:(id)sender;
Modified: trunk/bibdesk/BDSKLevelIndicatorCell.m
===================================================================
--- trunk/bibdesk/BDSKLevelIndicatorCell.m 2024-01-03 15:55:41 UTC (rev
28516)
+++ trunk/bibdesk/BDSKLevelIndicatorCell.m 2024-01-03 16:41:17 UTC (rev
28517)
@@ -39,10 +39,6 @@
#import "BDSKLevelIndicatorCell.h"
#import "NSGeometry_BDSKExtensions.h"
-#if SDK_BEFORE(10_14)
-#define NSAppearanceNameDarkAqua @"NSAppearanceNameDarkAqua"
-#endif
-
/* Subclass of NSLevelIndicatorCell. The default relevancy cell draws bars
the entire vertical height of the table row, which looks bad. Using
setControlSize: seems to have no effect.
*/
Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m 2024-01-03 15:55:41 UTC (rev
28516)
+++ trunk/bibdesk/BDSKPreferenceController.m 2024-01-03 16:41:17 UTC (rev
28517)
@@ -83,12 +83,6 @@
#define MASK_ALPHA 0.3
#define MAXIMUM_BLUR 10
-#if SDK_BEFORE(10_14)
-@interface NSColor (BDSKMojaveDeclarations)
-+ (NSColor *)separatorColor;
-@end
-#endif
-
@interface BDSKPreferenceFieldEditor : NSTextView
@end
Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m 2024-01-03 15:55:41 UTC (rev 28516)
+++ trunk/bibdesk/BDSKPreviewer.m 2024-01-03 16:41:17 UTC (rev 28517)
@@ -62,7 +62,7 @@
static NSData *defaultPDFDataForState(BDSKPreviewState state);
-#if SDK_BEFORE(10_14)
+#if SDK_BEFORE_10_14
@interface PDFView (BDSKMojaveDeclarations)
- (void)enablePageShadows:(BOOL)flag;
@end
Modified: trunk/bibdesk/BDSKZoomablePDFView.m
===================================================================
--- trunk/bibdesk/BDSKZoomablePDFView.m 2024-01-03 15:55:41 UTC (rev 28516)
+++ trunk/bibdesk/BDSKZoomablePDFView.m 2024-01-03 16:41:17 UTC (rev 28517)
@@ -45,13 +45,7 @@
#import "NSObject_BDSKExtensions.h"
#import "NSLayoutConstraint_BDSKExtensions.h"
-#if SDK_BEFORE(10_14)
-@interface NSView (BDSKMojaveDeclarations)
-- (void)viewDidChangeEffectiveAppearance;
-@end
-#endif
-
@interface BDSKBackgroundView : NSView
@end
Modified: trunk/bibdesk/NSColor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.m 2024-01-03 15:55:41 UTC (rev
28516)
+++ trunk/bibdesk/NSColor_BDSKExtensions.m 2024-01-03 16:41:17 UTC (rev
28517)
@@ -38,7 +38,7 @@
#import "NSColor_BDSKExtensions.h"
-#if SDK_BEFORE(10_14)
+#if SDK_BEFORE_10_14
@interface NSAppearance (BDSKMojaveDeclarations)
- (NSString *)bestMatchFromAppearancesWithNames:(NSArray *)names;
@@ -47,8 +47,6 @@
@interface NSApplication (BDSKMojaveDeclarations) <NSAppearanceCustomization>
@end
-#define NSAppearanceNameDarkAqua @"NSAppearanceNameDarkAqua"
-
#endif
BOOL BDSKHasDarkAppearance(id object) {
Modified: trunk/bibdesk/NSImage_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.m 2024-01-03 15:55:41 UTC (rev
28516)
+++ trunk/bibdesk/NSImage_BDSKExtensions.m 2024-01-03 16:41:17 UTC (rev
28517)
@@ -63,10 +63,6 @@
NSString *BDSKImageNameCautionIcon = @"BDSKCautionIcon";
-#if SDK_BEFORE(10_14)
-#define NSAppearanceNameDarkAqua @"NSAppearanceNameDarkAqua"
-#endif
-
@implementation NSImage (BDSKExtensions)
+ (void)makePreviewDisplayImages {
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
