Revision: 15831
http://sourceforge.net/p/skim-app/code/15831
Author: hofman
Date: 2025-11-25 17:14:27 +0000 (Tue, 25 Nov 2025)
Log Message:
-----------
use some types
Modified Paths:
--------------
trunk/NSEvent_SKExtensions.h
trunk/NSEvent_SKExtensions.m
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2025-11-25 17:01:30 UTC (rev 15830)
+++ trunk/NSEvent_SKExtensions.h 2025-11-25 17:14:27 UTC (rev 15831)
@@ -47,7 +47,7 @@
@interface NSEvent (SKExtensions)
-@property (nonatomic, readonly) NSUInteger deviceIndependentModifierFlags;
+@property (nonatomic, readonly) NSEventModifierFlags
deviceIndependentModifierFlags;
@property (class, nonatomic) NSPointingDeviceType currentPointingDeviceType;
Modified: trunk/NSEvent_SKExtensions.m
===================================================================
--- trunk/NSEvent_SKExtensions.m 2025-11-25 17:01:30 UTC (rev 15830)
+++ trunk/NSEvent_SKExtensions.m 2025-11-25 17:14:27 UTC (rev 15831)
@@ -42,7 +42,7 @@
static NSPointingDeviceType currentPointingDeviceType =
NSPointingDeviceTypeUnknown;
-- (NSUInteger)deviceIndependentModifierFlags {
+- (NSEventModifierFlags)deviceIndependentModifierFlags {
return [self modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask;
}
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2025-11-25 17:01:30 UTC (rev 15830)
+++ trunk/NSMenu_SKExtensions.h 2025-11-25 17:14:27 UTC (rev 15831)
@@ -50,8 +50,8 @@
- (NSMenuItem *)insertItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag atIndex:(NSInteger)anIndex;
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(nullable
NSImageName)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag atIndex:(NSInteger)anIndex;
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(nullable
NSImageName)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
- (NSMenuItem *)insertItemWithSubmenuAndTitle:(NSString *)aString
atIndex:(NSInteger)anIndex;
- (NSMenuItem *)addItemWithSubmenuAndTitle:(NSString *)aString;
@@ -63,7 +63,7 @@
- (instancetype)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
- (instancetype)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
-- (instancetype)initWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
+- (instancetype)initWithTitle:(NSString *)aString imageNamed:(nullable
NSImageName)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
- (instancetype)initWithSubmenuAndTitle:(NSString *)aString;
- (void)setImageAndSize:(NSImage *)image;
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2025-11-25 17:01:30 UTC (rev 15830)
+++ trunk/NSMenu_SKExtensions.m 2025-11-25 17:14:27 UTC (rev 15831)
@@ -66,13 +66,13 @@
return [self insertItemWithTitle:aString action:aSelector target:aTarget
tag:aTag atIndex:[self numberOfItems]];
}
-- (NSMenuItem *)insertItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag
atIndex:(NSInteger)anIndex {
+- (NSMenuItem *)insertItemWithTitle:(NSString *)aString
imageNamed:(NSImageName)anImageName action:(SEL)aSelector target:(id)aTarget
tag:(NSInteger)aTag atIndex:(NSInteger)anIndex {
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:aString
imageNamed:anImageName action:aSelector target:aTarget tag:aTag];
[self insertItem:item atIndex:anIndex];
return item;
}
-- (NSMenuItem *)addItemWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
+- (NSMenuItem *)addItemWithTitle:(NSString *)aString
imageNamed:(NSImageName)anImageName action:(SEL)aSelector target:(id)aTarget
tag:(NSInteger)aTag {
return [self insertItemWithTitle:aString imageNamed:anImageName
action:aSelector target:aTarget tag:aTag atIndex:[self numberOfItems]];
}
@@ -99,7 +99,7 @@
return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:aTag];
}
-- (instancetype)initWithTitle:(NSString *)aString imageNamed:(NSString
*)anImageName action:(SEL)aSelector target:(id)aTarget tag:(NSInteger)aTag {
+- (instancetype)initWithTitle:(NSString *)aString
imageNamed:(NSImageName)anImageName action:(SEL)aSelector target:(id)aTarget
tag:(NSInteger)aTag {
self = [self initWithTitle:aString action:aSelector keyEquivalent:@""];
if (self) {
if (anImageName)
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
