Revision: 9436
http://sourceforge.net/p/skim-app/code/9436
Author: hofman
Date: 2017-10-21 15:21:13 +0000 (Sat, 21 Oct 2017)
Log Message:
-----------
Type integer appkit version numbers. Only #define appkit version numbers with
pre 10.13 SDK
Modified Paths:
--------------
trunk/PDFAnnotationCircle_SKExtensions.m
trunk/PDFAnnotationInk_SKExtensions.m
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotationSquare_SKExtensions.m
trunk/PDFOutline_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/PDFView_SKExtensions.m
trunk/SKCompatibility.h
trunk/SKMainDocument.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesPage.m
trunk/SKPDFPage.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotationCircle_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationCircle_SKExtensions.m 2017-10-21 15:13:57 UTC (rev
9435)
+++ trunk/PDFAnnotationCircle_SKExtensions.m 2017-10-21 15:21:13 UTC (rev
9436)
@@ -52,7 +52,7 @@
self = [super initSkimNoteWithBounds:bounds];
if (self) {
// PDFAnnotationCircle over-retains the initial PDFBorder ivar on
10.6.x
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_6)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_6)
[[self border] release];
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKCircleNoteInteriorColorKey];
if ([color alphaComponent] > 0.0)
Modified: trunk/PDFAnnotationInk_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.m 2017-10-21 15:13:57 UTC (rev
9435)
+++ trunk/PDFAnnotationInk_SKExtensions.m 2017-10-21 15:21:13 UTC (rev
9436)
@@ -119,7 +119,7 @@
self = [super initSkimNoteWithBounds:bounds];
if (self) {
// PDFAnnotationInk over-retains the initial PDFBorder ivar on 10.6.x
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_6)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_6)
[[self border] release];
[self setColor:[[NSUserDefaults standardUserDefaults]
colorForKey:SKInkNoteColorKey]];
PDFBorder *border = [[PDFBorder allocWithZone:[self zone]] init];
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2017-10-21 15:13:57 UTC (rev
9435)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2017-10-21 15:21:13 UTC (rev
9436)
@@ -139,7 +139,7 @@
}
+ (void)load {
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_11)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_11)
original_drawWithBox_inContext = (void (*)(id, SEL, PDFDisplayBox,
CGContextRef))SKReplaceInstanceMethodImplementationFromSelector(self,
@selector(drawWithBox:inContext:),
@selector(replacement_drawWithBox:inContext:));
}
Modified: trunk/PDFAnnotationSquare_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationSquare_SKExtensions.m 2017-10-21 15:13:57 UTC (rev
9435)
+++ trunk/PDFAnnotationSquare_SKExtensions.m 2017-10-21 15:21:13 UTC (rev
9436)
@@ -52,7 +52,7 @@
self = [super initSkimNoteWithBounds:bounds];
if (self) {
// PDFAnnotationSquare over-retains the initial PDFBorder ivar on
10.6.x
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_6)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_6)
[[self border] release];
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKSquareNoteInteriorColorKey];
if ([color alphaComponent] > 0.0)
Modified: trunk/PDFOutline_SKExtensions.m
===================================================================
--- trunk/PDFOutline_SKExtensions.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/PDFOutline_SKExtensions.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -65,7 +65,7 @@
// on 10.12 the document is not weakly linked, so we need to clear it to avoid
a retain cycle
- (void)clearDocument {
- if ([self respondsToSelector:@selector(setDocument:)] == NO ||
(NSInteger)floor(NSAppKitVersionNumber) != NSAppKitVersionNumber10_12)
+ if ([self respondsToSelector:@selector(setDocument:)] == NO ||
(NSInteger)floor(NSAppKitVersionNumber) !=
(NSInteger)NSAppKitVersionNumber10_12)
return;
NSUInteger i, iMax = [self numberOfChildren];
for (i = 0; i < iMax; i++)
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/PDFPage_SKExtensions.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -268,7 +268,7 @@
NSData *data = nil;
PDFPage *page = [self copy];
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_11)
{
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_11) {
// on 10.11 the media box is shifted back to the origin without the
contents being shifted
[page setBounds:rect forBox:kPDFDisplayBoxCropBox];
} else {
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/PDFView_SKExtensions.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -138,7 +138,7 @@
original_drawPage_toContext(self, _cmd, pdfPage, context);
// On Sierra note annotations don't draw at all
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_12)
{
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_12) {
for (PDFAnnotation *annotation in [[[pdfPage annotations] copy]
autorelease]) {
if ([annotation shouldDisplay] && ([annotation isNote] ||
[[annotation type] isEqualToString:SKNTextString]))
[annotation drawWithBox:[self displayBox] inContext:context];
@@ -149,7 +149,7 @@
+ (void)load {
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_9 &&
floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_12)
original_keyDown = (void (*)(id, SEL,
id))SKReplaceInstanceMethodImplementationFromSelector(self,
@selector(keyDown:), @selector(replacement_keyDown:));
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_12)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_12)
original_drawPage_toContext = (void (*)(id, SEL, id,
CGContextRef))SKReplaceInstanceMethodImplementationFromSelector(self,
@selector(drawPage:toContext:), @selector(replacement_drawPage:toContext:));
}
Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKCompatibility.h 2017-10-21 15:21:13 UTC (rev 9436)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+#if !defined(MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_13
+
#ifndef NSAppKitVersionNumber10_6
#define NSAppKitVersionNumber10_6 1038
#endif
@@ -63,6 +65,8 @@
#define NSAppKitVersionNumber10_12 1504
#endif
+#endif
+
#ifndef NS_ENUM
#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
#endif
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKMainDocument.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -266,7 +266,7 @@
if (wasVisible == NO) {
// currently PDFView on 10.9 and later initially doesn't display the
PDF, messing around like this is a workaround for this bug
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_9) {
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_9) {
[[self mainWindowController] toggleStatusBar:nil];
[[self mainWindowController] toggleStatusBar:nil];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKMainWindowController_UI.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -1903,7 +1903,7 @@
[self snapshotNeedsUpdate:wc];
}
[secondaryPdfView requiresDisplay];
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_9)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_9)
[pdfView requiresDisplay];
}
Modified: trunk/SKNotesPage.m
===================================================================
--- trunk/SKNotesPage.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKNotesPage.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -53,7 +53,7 @@
- (NSAttributedString *)attributedString {
// on 10.6 the attributedstring is over-released by one
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_6)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_6)
return [[super attributedString] retain];
return [super attributedString];
}
Modified: trunk/SKPDFPage.m
===================================================================
--- trunk/SKPDFPage.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKPDFPage.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -91,7 +91,7 @@
- (NSAttributedString *)attributedString {
// on 10.6 the attributedstring is over-released by one
- if ((NSInteger)floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_6)
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_6)
return [[super attributedString] retain];
return [super attributedString];
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2017-10-21 15:13:57 UTC (rev 9435)
+++ trunk/SKPDFView.m 2017-10-21 15:21:13 UTC (rev 9436)
@@ -2005,7 +2005,7 @@
[page removeAnnotation:wasAnnotation];
[self annotationsChangedOnPage:page];
if ([wasAnnotation isNote]) {
- if ((NSInteger)floor(NSAppKitVersionNumber) ==
NSAppKitVersionNumber10_12 && [[page annotations] containsObject:wasAnnotation])
+ if ((NSInteger)floor(NSAppKitVersionNumber) ==
(NSInteger)NSAppKitVersionNumber10_12 && [[page annotations]
containsObject:wasAnnotation])
[page removeAnnotation:wasAnnotation];
[self resetPDFToolTipRects];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
