Revision: 13714
http://sourceforge.net/p/skim-app/code/13714
Author: hofman
Date: 2023-11-01 18:19:24 +0000 (Wed, 01 Nov 2023)
Log Message:
-----------
remove forward declarations of touchbar related classes
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/NSScrubber_SKForwardDeclarations.h
trunk/NSTouchBar_SKForwardDeclarations.h
Deleted: trunk/NSScrubber_SKForwardDeclarations.h
===================================================================
--- trunk/NSScrubber_SKForwardDeclarations.h 2023-11-01 18:12:46 UTC (rev
13713)
+++ trunk/NSScrubber_SKForwardDeclarations.h 2023-11-01 18:19:24 UTC (rev
13714)
@@ -1,226 +0,0 @@
-//
-// NSScrubber_SKForwardDeclarations.h
-// Skim
-//
-// Created by Christiaan Hofman on 14/05/2019.
-/*
- This software is Copyright (c) 2019-2023
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-#if SDK_BEFORE(10_12)
-
-@class NSScrubber;
-@class NSScrubberItemView;
-@class NSScrubberTextItemView;
-@class NSScrubberImageItemView;
-@class NSScrubberSelectionView;
-@class NSScrubberLayout;
-@class NSScrubberFlowLayout;
-@class NSScrubberProportionalLayout;
-
-@protocol NSScrubberDelegate;
-@protocol NSScrubberDataSource;
-
-typedef NS_ENUM(NSInteger, NSScrubberMode) {
- NSScrubberModeFixed = 0,
- NSScrubberModeFree
-};
-
-typedef NS_ENUM(NSInteger, NSScrubberAlignment) {
- NSScrubberAlignmentNone = 0,
- NSScrubberAlignmentLeading,
- NSScrubberAlignmentTrailing,
- NSScrubberAlignmentCenter
-};
-
-@interface NSScrubberSelectionStyle : NSObject <NSCoding>
-
-@property (class, strong, readonly) NSScrubberSelectionStyle
*outlineOverlayStyle;
-@property (class, strong, readonly) NSScrubberSelectionStyle
*roundedBackgroundStyle;
-
-- (NSScrubberSelectionView *)makeSelectionView;
-
-@end
-
-@interface NSScrubber : NSView
-
-@property (weak) id<NSScrubberDataSource> dataSource;
-@property (weak) id<NSScrubberDelegate> delegate;
-@property (strong) NSScrubberLayout *scrubberLayout;
-@property (readonly) NSInteger numberOfItems;
-@property (readonly) NSInteger highlightedIndex;
-@property NSInteger selectedIndex;
-@property NSScrubberMode mode;
-@property NSScrubberAlignment itemAlignment;
-@property (getter=isContinuous) BOOL continuous;
-@property BOOL floatsSelectionViews;
-@property (strong) NSScrubberSelectionStyle *selectionBackgroundStyle;
-@property (strong) NSScrubberSelectionStyle *selectionOverlayStyle;
-@property BOOL showsArrowButtons;
-@property BOOL showsAdditionalContentIndicators;
-@property (copy) NSColor *backgroundColor;
-@property (strong) NSView *backgroundView;
-
-- (void)reloadData;
-- (void)performSequentialBatchUpdates:(void(^)(void))updateBlock;
-- (void)insertItemsAtIndexes:(NSIndexSet *)indexes;
-- (void)removeItemsAtIndexes:(NSIndexSet *)indexes;
-- (void)reloadItemsAtIndexes:(NSIndexSet *)indexes;
-- (void)moveItemAtIndex:(NSInteger)oldIndex toIndex:(NSInteger)newIndex;
-- (void)scrollItemAtIndex:(NSInteger)index
toAlignment:(NSScrubberAlignment)alignment;
-
-- (NSScrubberItemView *)itemViewForItemAtIndex:(NSInteger)index;
-- (void)registerClass:(Class)itemViewClass
forItemIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier;
-- (void)registerNib:(NSNib *)nib
forItemIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier;
-- (NSScrubberItemView
*)makeItemWithIdentifier:(NSUserInterfaceItemIdentifier)itemIdentifier
owner:(id)owner;
-
-@end
-
-@protocol NSScrubberDataSource <NSObject>
-@required
-- (NSInteger)numberOfItemsForScrubber:(NSScrubber *)scrubber;
-- (NSScrubberItemView *)scrubber:(NSScrubber *)scrubber
viewForItemAtIndex:(NSInteger)index;
-@end
-
-@protocol NSScrubberDelegate <NSObject>
-@optional
-- (void)scrubber:(NSScrubber *)scrubber
didSelectItemAtIndex:(NSInteger)selectedIndex;
-- (void)scrubber:(NSScrubber *)scrubber
didHighlightItemAtIndex:(NSInteger)highlightedIndex;
-- (void)scrubber:(NSScrubber *)scrubber
didChangeVisibleRange:(NSRange)visibleRange;
-- (void)didBeginInteractingWithScrubber:(NSScrubber *)scrubber;
-- (void)didFinishInteractingWithScrubber:(NSScrubber *)scrubber;
-- (void)didCancelInteractingWithScrubber:(NSScrubber *)scrubber;
-@end
-
-@interface NSScrubberArrangedView : NSView
-@property (getter=isSelected) BOOL selected;
-@property (getter=isHighlighted) BOOL highlighted;
-
-- (void)applyLayoutAttributes:(NSScrubberLayoutAttributes *)layoutAttributes;
-
-@end
-
-@interface NSScrubberItemView : NSScrubberArrangedView
-@end
-
-@interface NSScrubberTextItemView : NSScrubberItemView
-
-@property (strong, readonly) NSTextField *textField;
-@property (copy) NSString *title;
-
-@end
-
-@interface NSScrubberImageItemView : NSScrubberItemView
-
-@property (strong, readonly) NSImageView *imageView;
-@property (copy) NSImage *image;
-@property NSImageAlignment imageAlignment;
-
-@end
-
-@interface NSScrubberLayoutAttributes : NSObject
-
-@property NSInteger itemIndex;
-@property NSRect frame;
-@property CGFloat alpha;
-
-+ (id)layoutAttributesForItemAtIndex:(NSInteger)index;
-
-@end
-
-@interface NSScrubberLayout : NSObject <NSCoding>
-
-@property (class, readonly) Class layoutAttributesClass;
-@property (weak, readonly) NSScrubber *scrubber;
-@property (readonly) NSRect visibleRect;
-
-- (void)invalidateLayout;
-
-- (void)prepareLayout;
-
-@property (readonly) NSSize scrubberContentSize;
-
-- (NSScrubberLayoutAttributes
*)layoutAttributesForItemAtIndex:(NSInteger)index;
-
-- (NSSet *)layoutAttributesForItemsInRect:(NSRect)rect;
-
-@property (readonly) BOOL shouldInvalidateLayoutForSelectionChange;
-@property (readonly) BOOL shouldInvalidateLayoutForHighlightChange;
-
-- (BOOL)shouldInvalidateLayoutForChangeFromVisibleRect:(NSRect)fromVisibleRect
toVisibleRect:(NSRect)toVisibleRect;
-
-@property (readonly) BOOL automaticallyMirrorsInRightToLeftLayout;
-
-@end
-
-@protocol NSScrubberFlowLayoutDelegate <NSScrubberDelegate>
-@optional
-- (NSSize)scrubber:(NSScrubber *)scrubber layout:(NSScrubberFlowLayout
*)layout sizeForItemAtIndex:(NSInteger)itemIndex;
-@end
-
-@interface NSScrubberFlowLayout : NSScrubberLayout
-
-@property CGFloat itemSpacing;
-@property NSSize itemSize;
-
-- (void)invalidateLayoutForItemsAtIndexes:(NSIndexSet *)invalidItemIndexes;
-
-@end
-
-@interface NSScrubberProportionalLayout : NSScrubberLayout
-
-@property NSInteger numberOfVisibleItems;
-
-- (id)initWithNumberOfVisibleItems:(NSInteger)numberOfVisibleItems;
-
-@end
-
-#else
-
-// When compiling against the 10.12.1 SDK or later, just provide forward
-// declarations to suppress the partial availability warnings.
-
-@class NSScrubber;
-@class NSScrubberItemView;
-@class NSScrubberTextItemView;
-@class NSScrubberImageItemView;
-@class NSScrubberSelectionView;
-@class NSScrubberLayout;
-@class NSScrubberFlowLayout;
-@class NSScrubberProportionalLayout;
-
-@protocol NSScrubberDelegate;
-@protocol NSScrubberDataSource;
-
-#endif
Deleted: trunk/NSTouchBar_SKForwardDeclarations.h
===================================================================
--- trunk/NSTouchBar_SKForwardDeclarations.h 2023-11-01 18:12:46 UTC (rev
13713)
+++ trunk/NSTouchBar_SKForwardDeclarations.h 2023-11-01 18:19:24 UTC (rev
13714)
@@ -1,146 +0,0 @@
-//
-// NSTouchBar_SKForwardDeclarations.h
-// Skim
-//
-// Created by Christiaan Hofman on 06/05/2019.
-/*
- This software is Copyright (c) 2019-2023
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-#if SDK_BEFORE(10_12)
-
-@class NSTouchBar;
-@class NSTouchBarItem;
-@class NSCustomTouchBarItem;
-@class NSPopoverTouchBarItem;
-
-@protocol NSTouchBarDelegate;
-
-@interface NSTouchBar : NSObject <NSCoding>
-
-- (id)init;
-- (id)initWithCoder:(NSCoder *)aDecoder;
-
-@property (copy) NSString *customizationIdentifier;
-@property (copy) NSArray *customizationAllowedItemIdentifiers;
-@property (copy) NSArray *customizationRequiredItemIdentifiers;
-@property (copy) NSArray *defaultItemIdentifiers;
-@property (copy, readonly) NSArray *itemIdentifiers;
-@property (copy) NSString *principalItemIdentifier;
-@property (copy) NSString *escapeKeyReplacementItemIdentifier;
-@property (copy) NSSet *templateItems;
-@property (weak) id <NSTouchBarDelegate> delegate;
-- (NSTouchBarItem *)itemForIdentifier:(NSString *)identifier;
-@property (readonly, getter=isVisible) BOOL visible;
-
-@end
-
-@protocol NSTouchBarDelegate<NSObject>
-@optional
-- (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar
makeItemForIdentifier:(NSString *)identifier;
-@end
-
-typedef float NSTouchBarItemPriority;
-
-@interface NSTouchBarItem : NSObject <NSCoding>
-
-- (id)initWithIdentifier:(NSString *)identifier;
-- (id)initWithCoder:(NSCoder *)coder;
-
-@property (readonly, copy) NSString *identifier;
-@property NSTouchBarItemPriority visibilityPriority;
-@property (readonly) NSView *view;
-@property (readonly) NSViewController *viewController;
-@property (readonly, copy) NSString *customizationLabel;
-@property (readonly, getter=isVisible) BOOL visible;
-
-@end
-
-@interface NSCustomTouchBarItem : NSTouchBarItem
-
-@property (strong) NSView *view;
-@property (strong) NSViewController *viewController;
-@property (copy) NSString *customizationLabel;
-
-@end
-
-@class NSGestureRecognizer;
-
-@interface NSPopoverTouchBarItem : NSTouchBarItem
-
-@property (strong) NSTouchBar *popoverTouchBar;
-@property (copy) NSString *customizationLabel;
-@property (strong) NSView *collapsedRepresentation;
-@property (strong) NSImage *collapsedRepresentationImage;
-@property (strong) NSString *collapsedRepresentationLabel;
-@property (strong) NSTouchBar *pressAndHoldTouchBar;
-@property BOOL showsCloseButton;
-
-- (void)showPopover:(id)sender;
-- (void)dismissPopover:(id)sender;
-
-- (NSGestureRecognizer *)makeStandardActivatePopoverGestureRecognizer;
-
-@end
-
-@interface NSColorPickerTouchBarItem : NSTouchBarItem
-
-+ (id)colorPickerWithIdentifier:(NSString *)identifier;
-+ (id)textColorPickerWithIdentifier:(NSString *)identifier;
-+ (id)strokeColorPickerWithIdentifier:(NSString *)identifier;
-+ (id)colorPickerWithIdentifier:(NSString *)identifier buttonImage:(NSImage
*)image;
-
-@property (copy) NSColor *color;
-@property BOOL showsAlpha;
-@property (strong) NSColorList *colorList;
-@property (copy) NSString *customizationLabel;
-@property (weak) id target;
-@property SEL action;
-@property (getter=isEnabled) BOOL enabled;
-
-@end
-
-#else
-
-// When compiling against the 10.12.1 SDK or later, just provide forward
-// declarations to suppress the partial availability warnings.
-
-@class NSTouchBar;
-@class NSTouchBarItem;
-@class NSCustomTouchBarItem;
-@class NSPopoverTouchBarItem;
-
-@protocol NSTouchBarDelegate;
-
-#endif
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2023-11-01 18:12:46 UTC (rev
13713)
+++ trunk/Skim.xcodeproj/project.pbxproj 2023-11-01 18:19:24 UTC (rev
13714)
@@ -860,7 +860,6 @@
CE3B8650260B994A00E18388 /* Skim.entitlements */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.entitlements; path =
Skim.entitlements; sourceTree = "<group>"; };
CE3ED11F218CAA7900474EF3 /* NSScroller_SKExtensions.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
NSScroller_SKExtensions.h; sourceTree = "<group>"; };
CE3ED120218CAA7900474EF3 /* NSScroller_SKExtensions.m */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
NSScroller_SKExtensions.m; sourceTree = "<group>"; };
- CE406978228B20F700C4F958 /* NSScrubber_SKForwardDeclarations.h
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
NSScrubber_SKForwardDeclarations.h; sourceTree = "<group>"; };
CE40D6141677A9DC00573882 /* SKTextNoteEditor.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKTextNoteEditor.h; sourceTree = "<group>"; };
CE40D6151677A9DC00573882 /* SKTextNoteEditor.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKTextNoteEditor.m; sourceTree = "<group>"; };
CE41A6CB0B975E5000ECF819 /* Skim.sdef */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.sdef; path =
Skim.sdef; sourceTree = "<group>"; };
@@ -1023,7 +1022,6 @@
CE8388BB115BC61F00DB1AD7 /* SKNoteTypeSheetController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SKNoteTypeSheetController.m; sourceTree = "<group>";
};
CE85D73D2280814B0022C560 /* SKMainTouchBarController.h */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
SKMainTouchBarController.h; sourceTree = "<group>"; };
CE85D73E2280814B0022C560 /* SKMainTouchBarController.m */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
SKMainTouchBarController.m; sourceTree = "<group>"; };
- CE85D7502280A4F10022C560 /* NSTouchBar_SKForwardDeclarations.h
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
NSTouchBar_SKForwardDeclarations.h; sourceTree = "<group>"; };
CE8978CB0CBFC70B00EA2D98 /* SKTemplateTag.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKTemplateTag.h; sourceTree = "<group>"; };
CE8978CC0CBFC70B00EA2D98 /* SKTemplateTag.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKTemplateTag.m; sourceTree = "<group>"; };
CE898F050C843A8B008A0856 /* PDFDDocument.icns */ = {isa =
PBXFileReference; lastKnownFileType = image.icns; path = PDFDDocument.icns;
sourceTree = "<group>"; };
@@ -2101,12 +2099,10 @@
CEFDEA9011F6FF8300D6FEBA /*
NSScreen_SKExtensions.m */,
CE3ED11F218CAA7900474EF3 /*
NSScroller_SKExtensions.h */,
CE3ED120218CAA7900474EF3 /*
NSScroller_SKExtensions.m */,
- CE406978228B20F700C4F958 /*
NSScrubber_SKForwardDeclarations.h */,
CEE54F6E0DA3FBE00037169F /*
NSSegmentedControl_SKExtensions.h */,
CEE54F6F0DA3FBE00037169F /*
NSSegmentedControl_SKExtensions.m */,
CE5234A41A6424F200710CF2 /*
NSShadow_SKExtensions.h */,
CE5234A51A6424F200710CF2 /*
NSShadow_SKExtensions.m */,
- CE85D7502280A4F10022C560 /*
NSTouchBar_SKForwardDeclarations.h */,
CEF7119F0B90B714003A2771 /*
NSUserDefaultsController_SKExtensions.h */,
CEF711A00B90B714003A2771 /*
NSUserDefaultsController_SKExtensions.m */,
CE20B1920C9F23CC007C72F9 /*
NSView_SKExtensions.h */,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
