【OCToSwift】CPDFChoiceWidgetAnnotation+PDFListView

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -2944,6 +2944,9 @@
 		BBBB6CCE2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */; };
 		BBBB6CCF2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */; };
 		BBBB6CD02AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */; };
+		BBBB6CD22AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */; };
+		BBBB6CD32AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */; };
+		BBBB6CD42AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */; };
 		BBBF68802A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
 		BBBF68812A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
 		BBBF68822A3BF17F0058E14E /* KMFilePromiseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */; };
@@ -3282,9 +3285,6 @@
 		F37322DE292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B4292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m */; };
 		F37322DF292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B4292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m */; };
 		F37322E0292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B4292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m */; };
-		F37322E1292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B6292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m */; };
-		F37322E2292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B6292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m */; };
-		F37322E3292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B6292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m */; };
 		F37322E4292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B7292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m */; };
 		F37322E5292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B7292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m */; };
 		F37322E6292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m in Sources */ = {isa = PBXBuildFile; fileRef = F37322B7292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m */; };
@@ -4704,6 +4704,7 @@
 		BBB9B335299A5F35004F3235 /* ObjectiveDropboxOfficial.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjectiveDropboxOfficial.framework; sourceTree = "<group>"; };
 		BBBB6CC92AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFButtonWidgetAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
+		BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CPDFChoiceWidgetAnnotation+PDFListView.swift"; sourceTree = "<group>"; };
 		BBBF687F2A3BF17F0058E14E /* KMFilePromiseProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMFilePromiseProvider.swift; sourceTree = "<group>"; };
 		BBBF68832A3C3AF10058E14E /* NSDocumentController+KMExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDocumentController+KMExtension.swift"; sourceTree = "<group>"; };
 		BBC2BCC4295DA8F30036B983 /* KMCropPreviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCropPreviewController.swift; sourceTree = "<group>"; };
@@ -4856,7 +4857,6 @@
 		F37322B3292DF9410013862C /* CPDFRedactAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFRedactAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322B4292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFFreeTextAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322B5292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
-		F37322B6292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFChoiceWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322B7292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFCircleAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322B8292DF9410013862C /* CPDFAnnotationModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CPDFAnnotationModel.m; sourceTree = "<group>"; };
 		F37322B9292DF9410013862C /* CPDFSquareAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFSquareAnnotation+PDFListView.h"; sourceTree = "<group>"; };
@@ -4877,7 +4877,6 @@
 		F37322CB292DF9410013862C /* CPDFRedactAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFRedactAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322CC292DF9410013862C /* CPDFAnnotationModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPDFAnnotationModel.h; sourceTree = "<group>"; };
 		F37322CD292DF9410013862C /* CPDFCircleAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFCircleAnnotation+PDFListView.h"; sourceTree = "<group>"; };
-		F37322CE292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFChoiceWidgetAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322CF292DF9410013862C /* CPDFWidgetAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFWidgetAnnotation+PDFListView.m"; sourceTree = "<group>"; };
 		F37322D1292DF9410013862C /* CPDFMarkupAnnotation+PDFListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPDFMarkupAnnotation+PDFListView.h"; sourceTree = "<group>"; };
 		F37322D2292DF9410013862C /* CPDFLinkAnnotation+PDFListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CPDFLinkAnnotation+PDFListView.m"; sourceTree = "<group>"; };
@@ -9202,8 +9201,7 @@
 				F37322CC292DF9410013862C /* CPDFAnnotationModel.h */,
 				F37322B8292DF9410013862C /* CPDFAnnotationModel.m */,
 				BBBB6CCD2AD13E210035AA66 /* CPDFButtonWidgetAnnotation+PDFListView.swift */,
-				F37322CE292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.h */,
-				F37322B6292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m */,
+				BBBB6CD12AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift */,
 				F37322CD292DF9410013862C /* CPDFCircleAnnotation+PDFListView.h */,
 				F37322B7292DF9410013862C /* CPDFCircleAnnotation+PDFListView.m */,
 				F37322C5292DF9410013862C /* CPDFFreeTextAnnotation+PDFListView.h */,
@@ -11121,7 +11119,6 @@
 				BB4EEF4C2976544F003A3537 /* KMRedactAligementView.swift in Sources */,
 				9F1FE4C029406E4700E952CA /* NSWindow+CTThemed.m in Sources */,
 				ADE614A32977952C00F62ED7 /* KMBatchConvertPDFViewModel.swift in Sources */,
-				F37322E1292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */,
 				9F0CB48729683DC400007028 /* KMPropertiesPanelPresetColorSubVC.swift in Sources */,
 				ADBA0464292CB90B00BF9184 /* KMBatchProcessingTableRowView.swift in Sources */,
 				9F1FE50229406E4700E952CA /* CTTabStripModelOrderController.m in Sources */,
@@ -11295,6 +11292,7 @@
 				9F0CB4F1298655BC00007028 /* KMDesignToken+ItemSpacing.swift in Sources */,
 				8997010E28F40842009AF911 /* KMOutlineViewController.swift in Sources */,
 				BB2F61502966A91D001CB369 /* KMBackgroundPropertyHomeController.swift in Sources */,
+				BBBB6CD22AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F1FE3DE293EE51F00E952CA /* KMMainDocument.swift in Sources */,
 				9F0201962A1F352100C9B673 /* KMAITranslationConfirmWindowController.swift in Sources */,
 				BBB9B31F299A5D6D004F3235 /* KMGoogleDriveManager.m in Sources */,
@@ -11716,7 +11714,6 @@
 				9F0CB4EA2986559400007028 /* KMDesignToken+PaddingBottom.swift in Sources */,
 				9F1FE4AF29406E4700E952CA /* CTPresentationModeController.m in Sources */,
 				9F0CB4FA298655E500007028 /* KMDesignToken+Border.swift in Sources */,
-				F37322E2292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */,
 				ADD1B6E92946C02600C3FFF7 /* KMPrintChoosePageSizeMultipageView.swift in Sources */,
 				9F0CB4602966C9E200007028 /* KMFormPropertPanelViewController.swift in Sources */,
 				ADCFFC0329C004AD007D3657 /* KMBookMarkTableRowView.swift in Sources */,
@@ -11974,6 +11971,7 @@
 				ADBC2D4529A0D09A006280C8 /* ImageToPDFTools.swift in Sources */,
 				BBBF68852A3C3AF10058E14E /* NSDocumentController+KMExtension.swift in Sources */,
 				AD8810A129A8459000178CA1 /* KMComparativeTableViewController.swift in Sources */,
+				BBBB6CD32AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F1FE4DC29406E4700E952CA /* NSURL+Utils.m in Sources */,
 				F35B484C29A4903300756255 /* NSPointerArray+PDFListView.m in Sources */,
 				BBB14A542978DD5400936EDB /* KMRedactTools.swift in Sources */,
@@ -12315,6 +12313,7 @@
 				89D2D2E4294C452B00BFF5FE /* KMPDFThumbnailView.swift in Sources */,
 				9F1F82B6292DEF370092C4B4 /* KMCloudDocumentsViewController.swift in Sources */,
 				BB003011298CA383002DD1A0 /* KMPreferenceSegementControl.swift in Sources */,
+				BBBB6CD42AD14A5F0035AA66 /* CPDFChoiceWidgetAnnotation+PDFListView.swift in Sources */,
 				9F8539D82943180000DF644E /* KMTabAppearance.swift in Sources */,
 				9FDD0F6D294AD12C000C4DAD /* KMMainViewController+UI.swift in Sources */,
 				F34BF95029531213002C25A2 /* NSGraphics+PDFListView.m in Sources */,
@@ -12583,7 +12582,6 @@
 				ADE3C1E029A5AA0B00793B13 /* KMRequestServer.swift in Sources */,
 				BBB9B31E299A5D6D004F3235 /* KMCloudOperation.m in Sources */,
 				BB8F4588295B19AC0037EA22 /* KMHeaderFooterDateInfoView.swift in Sources */,
-				F37322E3292DF9410013862C /* CPDFChoiceWidgetAnnotation+PDFListView.m in Sources */,
 				89D2D2BF29486D2400BFF5FE /* KMSignatureCellView.swift in Sources */,
 				BB2EDF56296E815E003BCF58 /* KMPageEditBaseItemView.swift in Sources */,
 				BB35C49B2974E18D00D46EE2 /* CustomAlertView.m in Sources */,

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFChoiceWidgetAnnotation+PDFListView.h

@@ -1,19 +0,0 @@
-//
-//  CPDFChoiceWidgetAnnotation+PDFListView.h
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import <ComPDFKit/ComPDFKit.h>
-
-@interface CPDFChoiceWidgetAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document listChoice:(BOOL)isListChoice;
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFChoiceWidgetAnnotation+PDFListView.m

@@ -1,64 +0,0 @@
-//
-//  CPDFChoiceWidgetAnnotation+PDFListView.m
-//  ComPDFKit
-//
-//  Copyright © 2014-2022 PDF Technologies, Inc. All Rights Reserved.
-//
-//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
-//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
-//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
-//  This notice may not be removed from this file.
-//
-
-#import "CPDFChoiceWidgetAnnotation+PDFListView.h"
-#import "CPDFAnnotationModel.h"
-#import <PDF_Master-Swift.h>
-
-@implementation CPDFChoiceWidgetAnnotation (PDFListView)
-
-- (instancetype)initPDFListViewNoteWithDocument:(CPDFDocument *)document listChoice:(BOOL)isListChoice{
-    self = [self initWithDocument:document listChoice:isListChoice];
-    if (self) {
-        if (isListChoice) {
-            CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:CAnnotationTypeListMenu];
-            [self setBackgroundColor:annotationModel.backgroundColor];
-            [self setBackgroundOpacity:annotationModel.backgroundOpacity];
-            self.border = [[CPDFBorder alloc] initWithStyle:annotationModel.style lineWidth:annotationModel.lineWidth dashPattern:annotationModel.dashPattern];
-            [self setFontColor:annotationModel.fontColor];
-            [self setFont:[NSFont fontWithName:annotationModel.fontName size:annotationModel.fontSize]];
-            
-            [self setFieldName:[NSString stringWithFormat:@"%@%@",@"List Box_",[CPDFAnnotationModel tagString]]];
-        } else {
-            CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:CAnnotationTypeComboBox];
-            [self setBackgroundColor:annotationModel.backgroundColor];
-            [self setBackgroundOpacity:annotationModel.backgroundOpacity];
-            self.border = [[CPDFBorder alloc] initWithStyle:annotationModel.style lineWidth:annotationModel.lineWidth dashPattern:annotationModel.dashPattern];
-
-            [self setFontColor:annotationModel.fontColor];
-            [self setFont:[NSFont fontWithName:annotationModel.fontName size:annotationModel.fontSize]];
-            
-            [self setFieldName:[NSString stringWithFormat:@"%@%@",@"Combo Box_",[CPDFAnnotationModel tagString]]];
-        }
-    }
-    return self;
-}
-
-- (BOOL)isMovable {
-    return YES;
-}
-
-- (BOOL)isResizable {
-    return YES;
-}
-
-- (NSSet *)keysForValuesToObserveForUndo {
-    static NSSet *circleKeys = nil;
-    if (circleKeys == nil) {
-        NSMutableSet *mutableKeys = [[super keysForValuesToObserveForUndo] mutableCopy];
-        [mutableKeys addObjectsFromArray:@[CPDFAnnotationItemsKey,CPDFAnnotationSelectItemAtIndexKey]];
-        circleKeys = mutableKeys;
-    }
-    return circleKeys;
-}
-
-@end

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFChoiceWidgetAnnotation+PDFListView.swift

@@ -0,0 +1,53 @@
+//
+//  CPDFChoiceWidgetAnnotation+PDFListView.swift
+//  PDF Master
+//
+//  Created by tangchao on 2023/10/7.
+//
+
+import Foundation
+
+@objc extension CPDFChoiceWidgetAnnotation {
+    convenience init(PDFListViewNoteWith document: CPDFDocument, listChoice isListChoice: Bool) {
+        self.init(document: document)
+        if (isListChoice) {
+            if let annotationModel = CPDFAnnotationModel(annotationType: .listMenu) {
+                self.backgroundColor = annotationModel.backgroundColor()
+                self.backgroundOpacity = annotationModel.backgroundOpacity()
+                self.border = CPDFBorder(style: annotationModel.style(), lineWidth: annotationModel.lineWidth(), dashPattern: annotationModel.dashPattern())
+                self.fontColor = annotationModel.fontColor()
+                self.font = NSFont(name: annotationModel.fontName(), size: annotationModel.fontSize())
+                
+                self.setFieldName(String(format: "%@%@", "List Box_", CPDFAnnotationModel.tagString()))
+            }
+        } else {
+            if let annotationModel = CPDFAnnotationModel(annotationType: .comboBox) {
+                self.backgroundColor = annotationModel.backgroundColor()
+                self.backgroundOpacity = annotationModel.backgroundOpacity()
+                self.border = CPDFBorder(style: annotationModel.style(), lineWidth: annotationModel.lineWidth(), dashPattern: annotationModel.dashPattern())
+                self.fontColor = annotationModel.fontColor()
+                self.font = NSFont(name: annotationModel.fontName(), size: annotationModel.fontSize())
+                
+                self.setFieldName(String(format: "%@%@", "Combo Box_", CPDFAnnotationModel.tagString()))
+            }
+        }
+    }
+    
+    override func isMovable() -> Bool {
+        return true
+    }
+    
+    override func isResizable() -> Bool {
+        return true
+    }
+    
+    private static var _cw_keys: Set<AnyHashable>?
+    override func keysForValuesToObserveForUndo() -> Set<AnyHashable>! {
+        if (CPDFChoiceWidgetAnnotation._cw_keys == nil) {
+            CPDFChoiceWidgetAnnotation._cw_keys = super.keysForValuesToObserveForUndo()
+            _ = CPDFChoiceWidgetAnnotation._cw_keys?.insert(CPDFAnnotationItemsKey)
+            _ = CPDFChoiceWidgetAnnotation._cw_keys?.insert(CPDFAnnotationSelectItemAtIndexKey)
+        }
+        return CPDFChoiceWidgetAnnotation._cw_keys
+    }
+}

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -30,15 +30,11 @@
 
 #import "CPDFMarkupAnnotation+PDFListView.h"
 #import "CPDFTextWidgetAnnotation+PDFListView.h"
-#import "CPDFChoiceWidgetAnnotation+PDFListView.h"
-#import "CPDFChoiceWidgetAnnotation+PDFListView.h"
 #import "CPDFLineAnnotation+PDFListView.h"
 #import "NSPopover+PDFListView.h"
 #import "CPDFListView+Extension.h"
 #import <PDF_Master-Swift.h>
 
-#import <PDF_Master-Swift.h>
-
 NSNotificationName const CPDFListViewSelectionChangedNotification = @"CPDFListViewSelectionChangedNotification";
 
 NSNotificationName const CPDFListViewToolModeChangeNotification = @"CPDFListViewToolModeChangeNotification";
@@ -391,11 +387,11 @@ NSNotificationName const CPDFListViewAnnotationsAttributeHasChangeNotification =
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeListMenu:
-                annotation = [[CPDFChoiceWidgetAnnotation alloc] initPDFListViewNoteWithDocument:self.document listChoice:YES];
+                annotation = [[CPDFChoiceWidgetAnnotation alloc] initWithPDFListViewNoteWith:self.document listChoice:YES];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeComboBox:
-                annotation = [[CPDFChoiceWidgetAnnotation alloc] initPDFListViewNoteWithDocument:self.document listChoice:NO];
+                annotation = [[CPDFChoiceWidgetAnnotation alloc] initWithPDFListViewNoteWith:self.document listChoice:NO];
                 annotation.bounds = bounds;
                 break;
             case CAnnotationTypeSignature:

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/ComPDFUIKit.h

@@ -29,5 +29,4 @@
 #import "CPDFSquareAnnotation+PDFListView.h"
 #import "CPDFWidgetAnnotation+PDFListView.h"
 #import "CPDFTextWidgetAnnotation+PDFListView.h"
-#import "CPDFChoiceWidgetAnnotation+PDFListView.h"
 #import "CPDFSignatureWidgetAnnotation+PDFListView.h"