[Skim-app-commit] SF.net SVN: skim-app:[14884] trunk/PDFDocumentView_ SKExtensions.m

[hofman--- via Skim-app-commit]

Revision: 14884
          http://sourceforge.net/p/skim-app/code/14884
Author:   hofman
Date:     2025-01-25 17:47:02 +0000 (Sat, 25 Jan 2025)
Log Message:
-----------
Don't trry getPDFView method as this is not implemented in supported OS versions

Modified Paths:
--------------
    trunk/PDFDocumentView_SKExtensions.m

Modified: trunk/PDFDocumentView_SKExtensions.m
===================================================================
--- trunk/PDFDocumentView_SKExtensions.m        2025-01-25 17:19:40 UTC (rev 
14883)
+++ trunk/PDFDocumentView_SKExtensions.m        2025-01-25 17:47:02 UTC (rev 
14884)
@@ -46,28 +46,27 @@
 #import <SkimNotes/SkimNotes.h>
 
 @interface NSView (SKPDFDisplayViewPrivateDeclarations)
-- (id)pdfView;
-- (id)getPDFView;
+- (PDFView *)pdfView;
 @end
 
 @interface NSObject (SKPDFAccessibilityNodeAnnotationPrivateDeclarations)
-- (id)annotation;
+- (PDFAnnotation *)annotation;
 @end
 
 #pragma mark -
 
-static id fallback_getPDFView(id self, SEL _cmd) {
+static id fallback_pdfView(id self, SEL _cmd) {
     id pdfView = [[self enclosingScrollView] superview];
     return [pdfView isKindOfClass:[PDFView class]] ? pdfView : nil;
 }
 
-static id fallback_ivar_getPDFView(id self, SEL _cmd) {
+static id fallback_ivar_pdfView(id self, SEL _cmd) {
     id pdfView = nil;
     @try {
         pdfView = [self valueForKeyPath:@"_private.pdfView"];
     }
     @catch (id exception) {
-        pdfView = fallback_getPDFView(self, _cmd);
+        pdfView = fallback_pdfView(self, _cmd);
     }
     return pdfView;
 }
@@ -157,13 +156,10 @@
         return;
 
     if ([PDFDocumentViewClass instancesRespondToSelector:@selector(pdfView)] 
== NO) {
-        if ([PDFDocumentViewClass 
instancesRespondToSelector:@selector(getPDFView)]) {
-            
SKAddInstanceMethodImplementationFromSelector(PDFDocumentViewClass, 
@selector(pdfView), @selector(getPDFView));
-        } else if (class_getInstanceVariable(PDFDocumentViewClass, 
"_private")) {
-            SKAddInstanceMethodImplementation(PDFDocumentViewClass, 
@selector(pdfView), (IMP)fallback_ivar_getPDFView, "@@:");
-        } else {
-            SKAddInstanceMethodImplementation(PDFDocumentViewClass, 
@selector(pdfView), (IMP)fallback_getPDFView, "@@:");
-        }
+        if (class_getInstanceVariable(PDFDocumentViewClass, "_private"))
+            SKAddInstanceMethodImplementation(PDFDocumentViewClass, 
@selector(pdfView), (IMP)fallback_ivar_pdfView, "@@:");
+        else
+            SKAddInstanceMethodImplementation(PDFDocumentViewClass, 
@selector(pdfView), (IMP)fallback_pdfView, "@@:");
     }
     
     original_updateTrackingAreas = (void (*)(id, 
SEL))SKReplaceInstanceMethodImplementation(PDFDocumentViewClass, 
@selector(updateTrackingAreas), (IMP)replacement_updateTrackingAreas);

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit