Skip to content

Commit 8f121bc

Browse files
timofey-soloninSpace Team
authored and
Space Team
committed
Derelocate NSTextAttachment and NSTextContainer methods
^KT-70031
1 parent cc0919d commit 8f121bc

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

Diff for: kotlin-native/platformLibs/src/platform/ios/UIKit.def

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@ compilerOpts = -framework UIKit
77
linkerOpts = -framework UIKit
88
excludedFunctions = UISceneErrorDomain
99

10-
objcClassesIncludingCategories = NSMutableParagraphStyle NSParagraphStyle NSTextContainer NSTextTab
10+
objcClassesIncludingCategories = NSMutableParagraphStyle NSParagraphStyle NSTextContainer NSTextTab NSTextAttachment
11+
allowIncludingObjCCategoriesFromDefFile = true
12+
---
13+
@interface NSTextAttachment(K)
14+
- (nullable UIImage *)imageForBounds:(CGRect)imageBounds textContainer:(nullable NSTextContainer *)textContainer characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
15+
- (CGRect)attachmentBoundsForTextContainer:(nullable NSTextContainer *)textContainer proposedLineFragment:(CGRect)lineFrag glyphPosition:(CGPoint)position characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
16+
@end
17+
18+
@interface NSTextContainer(K)
19+
@property (readonly, NS_NONATOMIC_IOSONLY) NSTextLayoutOrientation layoutOrientation API_AVAILABLE(macos(10.7), ios(7.0));
20+
@end

Diff for: kotlin-native/platformLibs/src/platform/osx/AppKit.def

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@ compilerOpts = -framework AppKit
77
linkerOpts = -framework AppKit
88

99
strictEnums = NSBezierPathElement
10-
objcClassesIncludingCategories = NSImage NSProgressIndicator NSCursor NSDocument NSGraphicsContext NSMutableParagraphStyle NSParagraphStyle NSTextTab NSToolbar NSWindow NSTextContainer
10+
objcClassesIncludingCategories = NSImage NSProgressIndicator NSCursor NSDocument NSGraphicsContext NSMutableParagraphStyle NSParagraphStyle NSTextTab NSToolbar NSWindow NSTextContainer NSTextAttachment
11+
allowIncludingObjCCategoriesFromDefFile = true
12+
---
13+
@interface NSTextAttachment(K)
14+
- (nullable NSImage *)imageForBounds:(CGRect)imageBounds textContainer:(nullable NSTextContainer *)textContainer characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
15+
- (CGRect)attachmentBoundsForTextContainer:(nullable NSTextContainer *)textContainer proposedLineFragment:(CGRect)lineFrag glyphPosition:(CGPoint)position characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
16+
@end
17+
18+
@interface NSTextContainer(K)
19+
@property (readonly, NS_NONATOMIC_IOSONLY) NSTextLayoutOrientation layoutOrientation API_AVAILABLE(macos(10.7), ios(7.0));
20+
@end

Diff for: kotlin-native/platformLibs/src/platform/tvos/UIKit.def

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@ compilerOpts = -framework UIKit
77
linkerOpts = -framework UIKit
88
excludedFunctions = UISceneErrorDomain
99

10-
objcClassesIncludingCategories = NSMutableParagraphStyle NSParagraphStyle NSTextContainer NSTextTab
10+
objcClassesIncludingCategories = NSMutableParagraphStyle NSParagraphStyle NSTextContainer NSTextTab NSTextAttachment
11+
allowIncludingObjCCategoriesFromDefFile = true
12+
---
13+
@interface NSTextAttachment(K)
14+
- (nullable UIImage *)imageForBounds:(CGRect)imageBounds textContainer:(nullable NSTextContainer *)textContainer characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
15+
- (CGRect)attachmentBoundsForTextContainer:(nullable NSTextContainer *)textContainer proposedLineFragment:(CGRect)lineFrag glyphPosition:(CGPoint)position characterIndex:(NSUInteger)charIndex API_AVAILABLE(macos(10.11), ios(7.0), tvos(9.0), visionos(1.0)) API_UNAVAILABLE(watchos);
16+
@end
17+
18+
@interface NSTextContainer(K)
19+
@property (readonly, NS_NONATOMIC_IOSONLY) NSTextLayoutOrientation layoutOrientation API_AVAILABLE(macos(10.7), ios(7.0));
20+
@end

0 commit comments

Comments
 (0)