From ac4514c596973bf9390650af04562a5faee4db9e Mon Sep 17 00:00:00 2001 From: Ariel Abreu Date: Mon, 25 Sep 2023 16:17:44 -0400 Subject: [PATCH] More stubs and fixes for Xcode --- AppKit/CMakeLists.txt | 9 ++ AppKit/CoreData_/NSPersistentDocument.m | 4 + AppKit/NSAccessibility.m | 8 + AppKit/NSAppearance.m | 4 + AppKit/NSCatalogColor.m | 5 + AppKit/NSCell.m | 16 ++ AppKit/NSCollectionViewLayout.m | 17 ++ AppKit/NSColorSpace.m | 12 ++ AppKit/NSDataAsset.h | 5 + AppKit/NSDataAsset.m | 15 ++ AppKit/NSGestureRecognizer.m | 34 ++++ AppKit/NSGraphics.m | 5 + AppKit/NSGridView.m | 68 ++++++++ AppKit/NSHaptics.h | 9 ++ AppKit/NSHaptics.m | 29 ++++ AppKit/NSImage.m | 153 +++++++++++++++++- AppKit/NSMatrix.m | 18 +-- AppKit/NSMenu.subproj/NSMenu.m | 6 + AppKit/NSMenu.subproj/NSMenuItem.m | 18 +++ AppKit/NSScrollView.m | 7 + AppKit/NSStoryboard.m | 17 ++ AppKit/NSSwitch.m | 18 +++ AppKit/NSTabView.m | 2 + AppKit/NSTextFinder.m | 15 ++ AppKit/NSToolTipWindow.m | 3 + AppKit/NSToolbar.subproj/NSToolbarView.m | 3 + AppKit/NSWindow.m | 2 + AppKit/include/AppKit/NSButtonCell.h | 2 + AppKit/include/AppKit/NSCell.h | 1 + AppKit/include/AppKit/NSMatrix.h | 2 +- AppKit/include/AppKit/NSTextFinder.h | 4 + AppKit/nib.subproj/NSIBHelpConnector.m | 18 +++ AppKit/nib.subproj/NSNib.m | 3 + .../NSNibAXRelationshipConnector.m | 27 ++++ .../NSNibAuxiliaryActionConnector.m | 18 +++ .../NSNibExternalObjectPlaceholder.m | 18 +++ AppKit/nib.subproj/NSWindowTemplate.h | 9 +- AppKit/nib.subproj/NSWindowTemplate.m | 20 +-- AppKit/nib.subproj/UINibCoding.m | 18 +++ QuartzCore/CAFilter.m | 3 + QuartzCore/CATransformLayer.m | 18 +++ QuartzCore/CMakeLists.txt | 1 + 42 files changed, 638 insertions(+), 26 deletions(-) create mode 100644 AppKit/NSDataAsset.h create mode 100644 AppKit/NSDataAsset.m create mode 100644 AppKit/NSGridView.m create mode 100644 AppKit/NSHaptics.h create mode 100644 AppKit/NSHaptics.m create mode 100644 AppKit/NSSwitch.m create mode 100644 AppKit/NSTextFinder.m create mode 100644 AppKit/nib.subproj/NSIBHelpConnector.m create mode 100644 AppKit/nib.subproj/NSNibAuxiliaryActionConnector.m create mode 100644 AppKit/nib.subproj/NSNibExternalObjectPlaceholder.m create mode 100644 AppKit/nib.subproj/UINibCoding.m create mode 100644 QuartzCore/CATransformLayer.m diff --git a/AppKit/CMakeLists.txt b/AppKit/CMakeLists.txt index 21381548..dc5e4b60 100644 --- a/AppKit/CMakeLists.txt +++ b/AppKit/CMakeLists.txt @@ -154,6 +154,10 @@ set(AppKit_sources nib.subproj/NSClassSwapper.m nib.subproj/NSNibAXRelationshipConnector.m nib.subproj/NSIBUserDefinedRuntimeAttributesConnector.m + nib.subproj/NSNibAuxiliaryActionConnector.m + nib.subproj/NSNibExternalObjectPlaceholder.m + nib.subproj/NSIBHelpConnector.m + nib.subproj/UINibCoding.m NSTextFieldCell.m NSFormCell.m @@ -439,6 +443,11 @@ set(AppKit_sources NSCollectionViewLayoutInvalidationContext.m NSLayoutGuide.m NSPressGestureRecognizer.m + NSGridView.m + NSHaptics.m + NSDataAsset.m + NSSwitch.m + NSTextFinder.m ) set_source_files_properties(${AppKit_sources} LANGUAGE C) diff --git a/AppKit/CoreData_/NSPersistentDocument.m b/AppKit/CoreData_/NSPersistentDocument.m index b2db4ceb..229801c1 100644 --- a/AppKit/CoreData_/NSPersistentDocument.m +++ b/AppKit/CoreData_/NSPersistentDocument.m @@ -24,6 +24,10 @@ #import #import +// not sure where to put this +NSString *const NSDataBinding = @"NSDataBinding"; +NSString *const NSDisplayNameBindingOption = @"NSDisplayNameBindingOption"; + @implementation NSPersistentDocument - (id) init { diff --git a/AppKit/NSAccessibility.m b/AppKit/NSAccessibility.m index a4bcd6e9..9aeeb449 100644 --- a/AppKit/NSAccessibility.m +++ b/AppKit/NSAccessibility.m @@ -1,6 +1,7 @@ #import #import #import +#import NSString *const NSAccessibilityChildrenAttribute = @"NSAccessibilityChildrenAttribute"; @@ -43,6 +44,8 @@ NSString *const NSAccessibilityVisibleChildrenAttribute = @"NSAccessibilityVisibleChildrenAttribute"; NSString *const NSAccessibilityWindowAttribute = @"NSAccessibilityWindowAttribute"; +NSString *const NSAccessibilityIdentifierAttribute = + @"NSAccessibilityIdentifierAttribute"; NSString *const NSAccessibilityInsertionPointLineNumberAttribute = @"NSAccessibilityInsertionPointLineNumberAttribute"; @@ -574,6 +577,11 @@ NSString *const NSAccessibilityAnnouncementKey = @"AXAnnouncementKey"; NSString *const NSAccessibilityAnnouncementRequestedNotification = @"AXAnnouncementRequested"; NSString *const NSAccessibilityPriorityKey = @"AXPriorityKey"; +NSRect NSAccessibilityFrameInView(NSView *parentView, NSRect frame) { + printf("STUB %s\n", __PRETTY_FUNCTION__); + return frame; +} + void NSAccessibilityPostNotification(id element, NSString *notification) { } diff --git a/AppKit/NSAppearance.m b/AppKit/NSAppearance.m index ec0b2043..87560358 100644 --- a/AppKit/NSAppearance.m +++ b/AppKit/NSAppearance.m @@ -21,6 +21,8 @@ NSString *const NSAppearanceNameAqua = @"NSAppearanceNameAqua"; NSString *const NSAppearanceNameDarkAqua = @"NSAppearanceNameDarkAqua"; +NSString *const NSAppearanceNameSystem = @"NSAppearanceNameSystem"; +NSString *const NSAppearanceNameTouchBar = @"NSAppearanceNameTouchBar"; NSString *const NSAppearanceNameLightContent = @"NSAppearanceNameLightContent"; NSString *const NSAppearanceNameVibrantDark = @"NSAppearanceNameVibrantDark"; NSString *const NSAppearanceNameVibrantLight = @"NSAppearanceNameVibrantLight"; @@ -28,6 +30,8 @@ NSString *const NSAppearanceNameAccessibilityHighContrastAqua = @"NSAppearanceNameAccessibilityAqua"; NSString *const NSAppearanceNameAccessibilityHighContrastDarkAqua = @"NSAppearanceNameAccessibilityDarkAqua"; +NSString *const NSAppearanceNameAccessibilityHighContrastSystem = + @"NSAppearanceNameAccessibilityHighContrastSystem"; NSString *const NSAppearanceNameAccessibilityHighContrastVibrantLight = @"NSAppearanceNameAccessibilityVibrantLight"; NSString *const NSAppearanceNameAccessibilityHighContrastVibrantDark = diff --git a/AppKit/NSCatalogColor.m b/AppKit/NSCatalogColor.m index 1066d667..6c42ac97 100644 --- a/AppKit/NSCatalogColor.m +++ b/AppKit/NSCatalogColor.m @@ -31,4 +31,9 @@ NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); } ++ (instancetype)newWithCoder:(NSCoder *)coder zone:(NSZone *)zone +{ + return nil; +} + @end diff --git a/AppKit/NSCell.m b/AppKit/NSCell.m index 78026a32..169f7bb5 100644 --- a/AppKit/NSCell.m +++ b/AppKit/NSCell.m @@ -1163,6 +1163,11 @@ static NSString *NSStringFromCellType(NSCellType type) { _objectValue]; } +- (void) _validateEditing: (id)unknown +{ + // required by ibtool +} + @end void NSDrawThreePartImage(NSRect frame, NSImage *startCap, NSImage *centerFill, @@ -1172,3 +1177,14 @@ void NSDrawThreePartImage(NSRect frame, NSImage *startCap, NSImage *centerFill, { NSUnimplementedFunction(); } + +void NSDrawNinePartImage(NSRect frame, NSImage* topLeftCorner, + NSImage* topEdgeFill, NSImage* topRightCorner, + NSImage* leftEdgeFill, NSImage* centerFill, + NSImage* rightEdgeFill, NSImage* bottomLeftCorner, + NSImage* bottomEdgeFill, NSImage* bottomRightCorner, + NSCompositingOperation operation, CGFloat alpha, + BOOL flipped) +{ + NSUnimplementedFunction(); +}; diff --git a/AppKit/NSCollectionViewLayout.m b/AppKit/NSCollectionViewLayout.m index 4c07e904..b989b25b 100644 --- a/AppKit/NSCollectionViewLayout.m +++ b/AppKit/NSCollectionViewLayout.m @@ -19,6 +19,9 @@ #import +@interface NSCollectionViewGridLayout : NSCollectionViewLayout +@end + NSCollectionViewSupplementaryElementKind const NSCollectionElementKindInterItemGapIndicator = @"NSCollectionElementKindInterItemGapIndicator"; @@ -36,3 +39,17 @@ NSCollectionViewSupplementaryElementKind const } @end + +@implementation NSCollectionViewGridLayout + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSColorSpace.m b/AppKit/NSColorSpace.m index 0d8c0b1b..6e5dace7 100644 --- a/AppKit/NSColorSpace.m +++ b/AppKit/NSColorSpace.m @@ -18,6 +18,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #import +#import + +// not sure where these belong +NSString *const _NSColorCoreUICatalogMainBundleID = + @"_NSColorCoreUICatalogMainBundleID"; +NSString *const _NSColorCoreUICatalogNamePrefix = + @"_NSColorCoreUICatalogNamePrefix"; @implementation NSColorSpace @@ -53,3 +60,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ } @end + +NSString* _NSColorSpaceNameFromNum(void) { + NSUnimplementedFunction(); + return nil; +}; diff --git a/AppKit/NSDataAsset.h b/AppKit/NSDataAsset.h new file mode 100644 index 00000000..b58307c3 --- /dev/null +++ b/AppKit/NSDataAsset.h @@ -0,0 +1,5 @@ +#import + +@interface NSDataAsset : NSObject + +@end diff --git a/AppKit/NSDataAsset.m b/AppKit/NSDataAsset.m new file mode 100644 index 00000000..553bacf3 --- /dev/null +++ b/AppKit/NSDataAsset.m @@ -0,0 +1,15 @@ +#import + +@implementation NSDataAsset + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSGestureRecognizer.m b/AppKit/NSGestureRecognizer.m index 7a5e17cf..4c9a9c52 100644 --- a/AppKit/NSGestureRecognizer.m +++ b/AppKit/NSGestureRecognizer.m @@ -19,6 +19,12 @@ #import +@interface NSMagnificationGestureRecognizer : NSGestureRecognizer +@end + +@interface NSRotationGestureRecognizer : NSGestureRecognizer +@end + @implementation NSGestureRecognizer - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector @@ -32,3 +38,31 @@ } @end + +@implementation NSRotationGestureRecognizer + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSMagnificationGestureRecognizer + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSGraphics.m b/AppKit/NSGraphics.m index 32a90824..763f353a 100644 --- a/AppKit/NSGraphics.m +++ b/AppKit/NSGraphics.m @@ -42,6 +42,7 @@ NSString *const NSCalibratedWhiteColorSpace = @"NSCalibratedWhiteColorSpace"; NSString *const NSCalibratedRGBColorSpace = @"NSCalibratedRGBColorSpace"; NSString *const NSNamedColorSpace = @"NSNamedColorSpace"; NSString *const NSPatternColorSpace = @"NSPatternColorSpace"; +NSString *const NSCustomColorSpace = @"NSCustomColorSpace"; NSString *const NSDeviceIsScreen = @"NSDeviceIsScreen"; NSString *const NSDeviceIsPrinter = @"NSDeviceIsPrinter"; @@ -538,3 +539,7 @@ void NSShowAnimationEffect(NSAnimationEffect effect, NSPoint center, didEndSelector: didEndSelector contextInfo: context]; } + +void NSSetFocusRingStyle(NSFocusRingPlacement placement) { + printf("STUB: %s\n", __PRETTY_FUNCTION__); +} diff --git a/AppKit/NSGridView.m b/AppKit/NSGridView.m new file mode 100644 index 00000000..2aedda4c --- /dev/null +++ b/AppKit/NSGridView.m @@ -0,0 +1,68 @@ +#import + +const CGFloat NSGridViewSizeForContent = 0; + +@interface NSGridView : NSView +@end +@interface NSGridCell : NSObject +@end +@interface NSGridColumn : NSObject +@end +@interface NSGridRow : NSObject +@end + +@implementation NSGridView + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSGridCell + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSGridColumn + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSGridRow + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSHaptics.h b/AppKit/NSHaptics.h new file mode 100644 index 00000000..eb41546f --- /dev/null +++ b/AppKit/NSHaptics.h @@ -0,0 +1,9 @@ +#import + +@interface NSHapticFeedbackManager : NSObject + +@end + +@interface NSAlignmentFeedbackFilter : NSObject + +@end diff --git a/AppKit/NSHaptics.m b/AppKit/NSHaptics.m new file mode 100644 index 00000000..38096260 --- /dev/null +++ b/AppKit/NSHaptics.m @@ -0,0 +1,29 @@ +#import + +@implementation NSHapticFeedbackManager + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSAlignmentFeedbackFilter + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSImage.m b/AppKit/NSImage.m index b1e0f9e5..b9342249 100644 --- a/AppKit/NSImage.m +++ b/AppKit/NSImage.m @@ -103,15 +103,162 @@ NSImageName const NSImageNameUserGroup = @"NSUserGroup"; NSImageName const NSImageNameUserGuest = @"NSUserGuest"; NSImageName const NSImageNameGoBackTemplate = @"NSGoBackTemplate"; NSImageName const NSImageNameGoForwardTemplate = @"NSGoForwardTemplate"; + +NSImageHintKey const NSImageHintInterpolation = @"NSImageHintInterpolation"; +NSImageHintKey const NSImageHintCTM = @"NSImageHintCTM"; + NSImageName const NSImageNameTouchBarDeleteTemplate = @"NSTouchBarDeleteTemplate"; NSImageName const NSImageNameTouchBarPauseTemplate = @"NSTouchBarPauseTemplate"; NSImageName const NSImageNameTouchBarPlayTemplate = @"NSTouchBarPlayTemplate"; NSImageName const NSImageNameTouchBarRecordStopTemplate = @"NSTouchBarRecordStopTemplate"; - -NSImageHintKey const NSImageHintInterpolation = @"NSImageHintInterpolation"; -NSImageHintKey const NSImageHintCTM = @"NSImageHintCTM"; +NSImageName const NSImageNameTouchBarAddDetailTemplate = + @"NSImageNameTouchBarAddDetailTemplate"; +NSImageName const NSImageNameTouchBarAddTemplate = + @"NSImageNameTouchBarAddTemplate"; +NSImageName const NSImageNameTouchBarAlarmTemplate = + @"NSImageNameTouchBarAlarmTemplate"; +NSImageName const NSImageNameTouchBarAudioInputMuteTemplate = + @"NSImageNameTouchBarAudioInputMuteTemplate"; +NSImageName const NSImageNameTouchBarAudioInputTemplate = + @"NSImageNameTouchBarAudioInputTemplate"; +NSImageName const NSImageNameTouchBarAudioOutputMuteTemplate = + @"NSImageNameTouchBarAudioOutputMuteTemplate"; +NSImageName const NSImageNameTouchBarAudioOutputVolumeHighTemplate = + @"NSImageNameTouchBarAudioOutputVolumeHighTemplate"; +NSImageName const NSImageNameTouchBarAudioOutputVolumeLowTemplate = + @"NSImageNameTouchBarAudioOutputVolumeLowTemplate"; +NSImageName const NSImageNameTouchBarAudioOutputVolumeMediumTemplate = + @"NSImageNameTouchBarAudioOutputVolumeMediumTemplate"; +NSImageName const NSImageNameTouchBarAudioOutputVolumeOffTemplate = + @"NSImageNameTouchBarAudioOutputVolumeOffTemplate"; +NSImageName const NSImageNameTouchBarBookmarksTemplate = + @"NSImageNameTouchBarBookmarksTemplate"; +NSImageName const NSImageNameTouchBarColorPickerFill = + @"NSImageNameTouchBarColorPickerFill"; +NSImageName const NSImageNameTouchBarColorPickerFont = + @"NSImageNameTouchBarColorPickerFont"; +NSImageName const NSImageNameTouchBarColorPickerStroke = + @"NSImageNameTouchBarColorPickerStroke"; +NSImageName const NSImageNameTouchBarCommunicationAudioTemplate = + @"NSImageNameTouchBarCommunicationAudioTemplate"; +NSImageName const NSImageNameTouchBarCommunicationVideoTemplate = + @"NSImageNameTouchBarCommunicationVideoTemplate"; +NSImageName const NSImageNameTouchBarComposeTemplate = + @"NSImageNameTouchBarComposeTemplate"; +NSImageName const NSImageNameTouchBarDownloadTemplate = + @"NSImageNameTouchBarDownloadTemplate"; +NSImageName const NSImageNameTouchBarEnterFullScreenTemplate = + @"NSImageNameTouchBarEnterFullScreenTemplate"; +NSImageName const NSImageNameTouchBarExitFullScreenTemplate = + @"NSImageNameTouchBarExitFullScreenTemplate"; +NSImageName const NSImageNameTouchBarFastForwardTemplate = + @"NSImageNameTouchBarFastForwardTemplate"; +NSImageName const NSImageNameTouchBarFolderCopyToTemplate = + @"NSImageNameTouchBarFolderCopyToTemplate"; +NSImageName const NSImageNameTouchBarFolderMoveToTemplate = + @"NSImageNameTouchBarFolderMoveToTemplate"; +NSImageName const NSImageNameTouchBarFolderTemplate = + @"NSImageNameTouchBarFolderTemplate"; +NSImageName const NSImageNameTouchBarGetInfoTemplate = + @"NSImageNameTouchBarGetInfoTemplate"; +NSImageName const NSImageNameTouchBarGoBackTemplate = + @"NSImageNameTouchBarGoBackTemplate"; +NSImageName const NSImageNameTouchBarGoDownTemplate = + @"NSImageNameTouchBarGoDownTemplate"; +NSImageName const NSImageNameTouchBarGoForwardTemplate = + @"NSImageNameTouchBarGoForwardTemplate"; +NSImageName const NSImageNameTouchBarGoUpTemplate = + @"NSImageNameTouchBarGoUpTemplate"; +NSImageName const NSImageNameTouchBarHistoryTemplate = + @"NSImageNameTouchBarHistoryTemplate"; +NSImageName const NSImageNameTouchBarIconViewTemplate = + @"NSImageNameTouchBarIconViewTemplate"; +NSImageName const NSImageNameTouchBarListViewTemplate = + @"NSImageNameTouchBarListViewTemplate"; +NSImageName const NSImageNameTouchBarMailTemplate = + @"NSImageNameTouchBarMailTemplate"; +NSImageName const NSImageNameTouchBarNewFolderTemplate = + @"NSImageNameTouchBarNewFolderTemplate"; +NSImageName const NSImageNameTouchBarNewMessageTemplate = + @"NSImageNameTouchBarNewMessageTemplate"; +NSImageName const NSImageNameTouchBarOpenInBrowserTemplate = + @"NSImageNameTouchBarOpenInBrowserTemplate"; +NSImageName const NSImageNameTouchBarPlayheadTemplate = + @"NSImageNameTouchBarPlayheadTemplate"; +NSImageName const NSImageNameTouchBarPlayPauseTemplate = + @"NSImageNameTouchBarPlayPauseTemplate"; +NSImageName const NSImageNameTouchBarQuickLookTemplate = + @"NSImageNameTouchBarQuickLookTemplate"; +NSImageName const NSImageNameTouchBarRecordStartTemplate = + @"NSImageNameTouchBarRecordStartTemplate"; +NSImageName const NSImageNameTouchBarRefreshTemplate = + @"NSImageNameTouchBarRefreshTemplate"; +NSImageName const NSImageNameTouchBarRemoveTemplate = + @"NSImageNameTouchBarRemoveTemplate"; +NSImageName const NSImageNameTouchBarRewindTemplate = + @"NSImageNameTouchBarRewindTemplate"; +NSImageName const NSImageNameTouchBarRotateLeftTemplate = + @"NSImageNameTouchBarRotateLeftTemplate"; +NSImageName const NSImageNameTouchBarRotateRightTemplate = + @"NSImageNameTouchBarRotateRightTemplate"; +NSImageName const NSImageNameTouchBarSearchTemplate = + @"NSImageNameTouchBarSearchTemplate"; +NSImageName const NSImageNameTouchBarShareTemplate = + @"NSImageNameTouchBarShareTemplate"; +NSImageName const NSImageNameTouchBarSidebarTemplate = + @"NSImageNameTouchBarSidebarTemplate"; +NSImageName const NSImageNameTouchBarSkipAhead15SecondsTemplate = + @"NSImageNameTouchBarSkipAhead15SecondsTemplate"; +NSImageName const NSImageNameTouchBarSkipAhead30SecondsTemplate = + @"NSImageNameTouchBarSkipAhead30SecondsTemplate"; +NSImageName const NSImageNameTouchBarSkipAheadTemplate = + @"NSImageNameTouchBarSkipAheadTemplate"; +NSImageName const NSImageNameTouchBarSkipBack15SecondsTemplate = + @"NSImageNameTouchBarSkipBack15SecondsTemplate"; +NSImageName const NSImageNameTouchBarSkipBack30SecondsTemplate = + @"NSImageNameTouchBarSkipBack30SecondsTemplate"; +NSImageName const NSImageNameTouchBarSkipBackTemplate = + @"NSImageNameTouchBarSkipBackTemplate"; +NSImageName const NSImageNameTouchBarSkipToEndTemplate = + @"NSImageNameTouchBarSkipToEndTemplate"; +NSImageName const NSImageNameTouchBarSkipToStartTemplate = + @"NSImageNameTouchBarSkipToStartTemplate"; +NSImageName const NSImageNameTouchBarSlideshowTemplate = + @"NSImageNameTouchBarSlideshowTemplate"; +NSImageName const NSImageNameTouchBarTagIconTemplate = + @"NSImageNameTouchBarTagIconTemplate"; +NSImageName const NSImageNameTouchBarTextBoldTemplate = + @"NSImageNameTouchBarTextBoldTemplate"; +NSImageName const NSImageNameTouchBarTextBoxTemplate = + @"NSImageNameTouchBarTextBoxTemplate"; +NSImageName const NSImageNameTouchBarTextCenterAlignTemplate = + @"NSImageNameTouchBarTextCenterAlignTemplate"; +NSImageName const NSImageNameTouchBarTextItalicTemplate = + @"NSImageNameTouchBarTextItalicTemplate"; +NSImageName const NSImageNameTouchBarTextJustifiedAlignTemplate = + @"NSImageNameTouchBarTextJustifiedAlignTemplate"; +NSImageName const NSImageNameTouchBarTextLeftAlignTemplate = + @"NSImageNameTouchBarTextLeftAlignTemplate"; +NSImageName const NSImageNameTouchBarTextListTemplate = + @"NSImageNameTouchBarTextListTemplate"; +NSImageName const NSImageNameTouchBarTextRightAlignTemplate = + @"NSImageNameTouchBarTextRightAlignTemplate"; +NSImageName const NSImageNameTouchBarTextStrikethroughTemplate = + @"NSImageNameTouchBarTextStrikethroughTemplate"; +NSImageName const NSImageNameTouchBarTextUnderlineTemplate = + @"NSImageNameTouchBarTextUnderlineTemplate"; +NSImageName const NSImageNameTouchBarUserAddTemplate = + @"NSImageNameTouchBarUserAddTemplate"; +NSImageName const NSImageNameTouchBarUserGroupTemplate = + @"NSImageNameTouchBarUserGroupTemplate"; +NSImageName const NSImageNameTouchBarUserTemplate = + @"NSImageNameTouchBarUserTemplate"; +NSImageName const NSImageNameTouchBarVolumeDownTemplate = + @"NSImageNameTouchBarVolumeDownTemplate"; +NSImageName const NSImageNameTouchBarVolumeUpTemplate = + @"NSImageNameTouchBarVolumeUpTemplate"; // Private class used so the context knows the flipped status of a locked image // 10.4 does something like that - probably for more than just getting the diff --git a/AppKit/NSMatrix.m b/AppKit/NSMatrix.m index f5cdf767..bf9473cc 100644 --- a/AppKit/NSMatrix.m +++ b/AppKit/NSMatrix.m @@ -72,7 +72,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ } _cellClass = [NSCell class]; } - _prototype = [[keyed decodeObjectForKey: @"NSProtoCell"] retain]; + _protoCell = [[keyed decodeObjectForKey: @"NSProtoCell"] retain]; _cells = [[NSMutableArray alloc] initWithArray: [keyed decodeObjectForKey: @"NSCells"]]; id selectedCell = [keyed decodeObjectForKey: @"NSSelectedCell"]; @@ -102,7 +102,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ _keyCellIndex = -1; _cellSize = NSMakeSize(frame.size.width, 20); _intercellSpacing = NSMakeSize(0, 0); - _prototype = nil; + _protoCell = nil; _cellClass = [NSCell class]; _mode = NSListModeMatrix; _tabKeyTraversesCells = YES; @@ -121,11 +121,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ [self initWithFrame: frame]; _mode = mode; - _prototype = [prototype copy]; + _protoCell = [prototype copy]; _numberOfRows = rows; _numberOfColumns = columns; for (i = 0; i < rows * columns; i++) - [_cells addObject: [[_prototype copy] autorelease]]; + [_cells addObject: [[_protoCell copy] autorelease]]; return self; } @@ -155,7 +155,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ [_backgroundColor release]; [_cellBackgroundColor release]; [_cells release]; - [_prototype release]; + [_protoCell release]; [super dealloc]; } @@ -262,7 +262,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ } - prototype { - return _prototype; + return _protoCell; } - (NSArray *) cells { @@ -494,8 +494,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - (void) setPrototype: (NSCell *) cell { cell = [cell retain]; - [_prototype release]; - _prototype = cell; + [_protoCell release]; + _protoCell = cell; } - (void) _deselectAllCells { @@ -522,7 +522,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ } - (NSCell *) makeCellAtRow: (NSInteger) row column: (NSInteger) column { - NSCell *result = [[_prototype copy] autorelease]; + NSCell *result = [[_protoCell copy] autorelease]; if (result == nil) result = [[[_cellClass alloc] init] autorelease]; diff --git a/AppKit/NSMenu.subproj/NSMenu.m b/AppKit/NSMenu.subproj/NSMenu.m index 0ef891cc..f1b3bfe7 100644 --- a/AppKit/NSMenu.subproj/NSMenu.m +++ b/AppKit/NSMenu.subproj/NSMenu.m @@ -28,6 +28,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ const NSNotificationName NSMenuDidBeginTrackingNotification = @"NSMenuDidBeginTrackingNotification"; const NSNotificationName NSMenuDidEndTrackingNotification = @"NSMenuDidEndTrackingNotification"; +NSString *const _NSFontMenuName = @"Font"; +NSString *const _NSHelpMenuName = @"Help"; +NSString *const _NSMainMenuName = @"Application"; +NSString *const _NSRecentDocumentsMenuName = @"Recents"; +NSString *const _NSServicesMenuName = @"Services"; +NSString *const _NSWindowsMenuName = @"Window"; @implementation NSMenu diff --git a/AppKit/NSMenu.subproj/NSMenuItem.m b/AppKit/NSMenu.subproj/NSMenuItem.m index 9895cb1b..6ccd0307 100644 --- a/AppKit/NSMenu.subproj/NSMenuItem.m +++ b/AppKit/NSMenu.subproj/NSMenuItem.m @@ -23,6 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #import #import #import +#import + +@interface NSMenuItemCell : NSButtonCell +@end @implementation NSMenuItem @@ -398,3 +402,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ } @end + +@implementation NSMenuItemCell + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSScrollView.m b/AppKit/NSScrollView.m index 60732746..2afdd224 100644 --- a/AppKit/NSScrollView.m +++ b/AppKit/NSScrollView.m @@ -34,6 +34,13 @@ NSString *const NSScrollViewWillStartLiveScrollNotification = @"NSScrollViewWillStartLiveScrollNotification"; NSString *const NSScrollViewDidLiveScrollNotification = @"NSScrollViewDidLiveScrollNotification"; +NSString *const NSScrollViewWillStartLiveMagnifyNotification = + @"NSScrollViewWillStartLiveMagnifyNotification"; +NSString *const NSScrollViewDidEndLiveMagnifyNotification = + @"NSScrollViewDidEndLiveMagnifyNotification"; + +NSString *const NSPreferredScrollerStyleDidChangeNotification = + @"NSPreferredScrollerStyleDidChangeNotification"; @implementation NSScrollView diff --git a/AppKit/NSStoryboard.m b/AppKit/NSStoryboard.m index 4fe8de38..0fe62efd 100644 --- a/AppKit/NSStoryboard.m +++ b/AppKit/NSStoryboard.m @@ -19,6 +19,9 @@ #import +@interface NSStoryboardControllerPlaceholder : NSObject +@end + @implementation NSStoryboard - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector @@ -32,3 +35,17 @@ } @end + +@implementation NSStoryboardControllerPlaceholder + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSSwitch.m b/AppKit/NSSwitch.m new file mode 100644 index 00000000..bcfc725f --- /dev/null +++ b/AppKit/NSSwitch.m @@ -0,0 +1,18 @@ +#import + +@interface NSSwitch : NSControl +@end + +@implementation NSSwitch + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSTabView.m b/AppKit/NSTabView.m index c07d49fa..b4350498 100644 --- a/AppKit/NSTabView.m +++ b/AppKit/NSTabView.m @@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #import #import +id _NSTabViewFloatingCell = nil; + @interface NSTabViewItem (NSTabViewItem_private) - (void) setTabView: (NSTabView *) tabView; - (void) setTabState: (NSTabState) tabState; diff --git a/AppKit/NSTextFinder.m b/AppKit/NSTextFinder.m new file mode 100644 index 00000000..19c56590 --- /dev/null +++ b/AppKit/NSTextFinder.m @@ -0,0 +1,15 @@ +#import + +@implementation NSTextFinder + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/NSToolTipWindow.m b/AppKit/NSToolTipWindow.m index f92403ce..8846ff32 100644 --- a/AppKit/NSToolTipWindow.m +++ b/AppKit/NSToolTipWindow.m @@ -34,6 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // Those occurences are marked with "Should...". #define TEXTFIELD_MARGIN 3.0 +// not sure where to put this +NSString *const NSToolTipHelpKey = @"NSToolTipHelp"; + @implementation NSToolTipWindow + (NSToolTipWindow *) sharedToolTipWindow { diff --git a/AppKit/NSToolbar.subproj/NSToolbarView.m b/AppKit/NSToolbar.subproj/NSToolbarView.m index 4b5923f3..59e83400 100644 --- a/AppKit/NSToolbar.subproj/NSToolbarView.m +++ b/AppKit/NSToolbar.subproj/NSToolbarView.m @@ -34,6 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #import #import +NSString *const _NSToolbarItemDragType = @"NSToolbarItemDragType"; +NSString *const _NSToolbarItemIdentifierPboardType = @"NSToolbarItemIdentifierPboardType"; + @interface NSToolbar (Private) - (NSArray *) _itemsWithIdentifiers: (NSArray *) identifiers; - (NSArray *) _allowedToolbarItems; diff --git a/AppKit/NSWindow.m b/AppKit/NSWindow.m index cc510559..bb49aabc 100644 --- a/AppKit/NSWindow.m +++ b/AppKit/NSWindow.m @@ -84,6 +84,8 @@ const NSNotificationName NSWindowAnimatingNotification = const NSNotificationName NSWindowDidAnimateNotification = @"NSWindowDidAnimateNotification"; +const NSNotificationName NSWindowDidChangeBackingPropertiesNotification = + @"NSWindowDidChangeBackingPropertiesNotification"; const NSNotificationName NSWindowDidChangeOcclusionStateNotification = @"NSWindowDidChangeOcclusionStateNotification"; const NSNotificationName NSWindowDidChangeScreenNotification = diff --git a/AppKit/include/AppKit/NSButtonCell.h b/AppKit/include/AppKit/NSButtonCell.h index 6c72d831..3f666149 100644 --- a/AppKit/include/AppKit/NSButtonCell.h +++ b/AppKit/include/AppKit/NSButtonCell.h @@ -88,6 +88,8 @@ typedef enum { NSFont *_keyEquivalentFont; NSColor *_backgroundColor; float _periodicDelay, _periodicInterval; + NSImage *_alternateImageOrKeyEquivalentFont; + NSUInteger _bcFlags; } - (BOOL) isTransparent; diff --git a/AppKit/include/AppKit/NSCell.h b/AppKit/include/AppKit/NSCell.h index e9303b45..d3c7685b 100644 --- a/AppKit/include/AppKit/NSCell.h +++ b/AppKit/include/AppKit/NSCell.h @@ -111,6 +111,7 @@ enum { NSFocusRingType _focusRingType; NSLineBreakMode _lineBreakMode; NSBackgroundStyle _backgroundStyle; + NSUInteger _cFlags; // required for Xcode BOOL _isEnabled; BOOL _isEditable; diff --git a/AppKit/include/AppKit/NSMatrix.h b/AppKit/include/AppKit/NSMatrix.h index 56087d32..bfcc7e19 100644 --- a/AppKit/include/AppKit/NSMatrix.h +++ b/AppKit/include/AppKit/NSMatrix.h @@ -42,7 +42,7 @@ typedef enum { NSInteger _keyCellIndex; NSSize _cellSize; NSSize _intercellSpacing; - id _prototype; + id _protoCell; Class _cellClass; NSMatrixMode _mode; BOOL _selectionByRect; diff --git a/AppKit/include/AppKit/NSTextFinder.h b/AppKit/include/AppKit/NSTextFinder.h index 8d397e1e..1b903db9 100644 --- a/AppKit/include/AppKit/NSTextFinder.h +++ b/AppKit/include/AppKit/NSTextFinder.h @@ -7,3 +7,7 @@ @protocol NSTextFinderClient @end + +@interface NSTextFinder : NSObject + +@end diff --git a/AppKit/nib.subproj/NSIBHelpConnector.m b/AppKit/nib.subproj/NSIBHelpConnector.m new file mode 100644 index 00000000..3f11b787 --- /dev/null +++ b/AppKit/nib.subproj/NSIBHelpConnector.m @@ -0,0 +1,18 @@ +#import + +@interface NSIBHelpConnector : NSObject +@end + +@implementation NSIBHelpConnector + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/nib.subproj/NSNib.m b/AppKit/nib.subproj/NSNib.m index c0aaa6dc..da255e24 100644 --- a/AppKit/nib.subproj/NSNib.m +++ b/AppKit/nib.subproj/NSNib.m @@ -32,6 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ NSString *const NSNibOwner = @"NSOwner"; NSString *const NSNibTopLevelObjects = @"NSNibTopLevelObjects"; +// IB = Interface Builder; i'm guessing this subproject is a good place for it +NSString *const IBCocoaFramework = @"Cocoa"; + @implementation NSNib - initWithCoder: (NSCoder *) coder { diff --git a/AppKit/nib.subproj/NSNibAXRelationshipConnector.m b/AppKit/nib.subproj/NSNibAXRelationshipConnector.m index b5e38b55..e2ee3d4e 100644 --- a/AppKit/nib.subproj/NSNibAXRelationshipConnector.m +++ b/AppKit/nib.subproj/NSNibAXRelationshipConnector.m @@ -1,5 +1,32 @@ #import "NSNibAXRelationshipConnector.h" +@interface NSNibAXAttributeConnector : NSObject +@end + @implementation NSNibAXRelationshipConnector +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end + +@implementation NSNibAXAttributeConnector + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + @end diff --git a/AppKit/nib.subproj/NSNibAuxiliaryActionConnector.m b/AppKit/nib.subproj/NSNibAuxiliaryActionConnector.m new file mode 100644 index 00000000..29ff7f0b --- /dev/null +++ b/AppKit/nib.subproj/NSNibAuxiliaryActionConnector.m @@ -0,0 +1,18 @@ +#import + +@interface NSNibAuxiliaryActionConnector : NSObject +@end + +@implementation NSNibAuxiliaryActionConnector + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/nib.subproj/NSNibExternalObjectPlaceholder.m b/AppKit/nib.subproj/NSNibExternalObjectPlaceholder.m new file mode 100644 index 00000000..87485ac7 --- /dev/null +++ b/AppKit/nib.subproj/NSNibExternalObjectPlaceholder.m @@ -0,0 +1,18 @@ +#import + +@interface NSNibExternalObjectPlaceholder : NSObject +@end + +@implementation NSNibExternalObjectPlaceholder + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/AppKit/nib.subproj/NSWindowTemplate.h b/AppKit/nib.subproj/NSWindowTemplate.h index d5e5bcfe..e1e64dae 100644 --- a/AppKit/nib.subproj/NSWindowTemplate.h +++ b/AppKit/nib.subproj/NSWindowTemplate.h @@ -23,17 +23,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ @class NSView; @interface NSWindowTemplate : NSObject { + // the ivars without a `_` prefix are like that because Xcode + // requires them to be named like that. + NSSize _maxSize; NSSize _minSize; - NSRect _screenRect; + NSRect screenRect; id _viewClass; unsigned _wtFlags; int _windowBacking; NSString *_windowClass; - NSRect _windowRect; + NSRect windowRect; int _windowStyleMask; NSString *_windowTitle; - NSView *_windowView; + NSView *windowView; NSString *_windowAutosave; } diff --git a/AppKit/nib.subproj/NSWindowTemplate.m b/AppKit/nib.subproj/NSWindowTemplate.m index 929acf5a..a4d82c87 100644 --- a/AppKit/nib.subproj/NSWindowTemplate.m +++ b/AppKit/nib.subproj/NSWindowTemplate.m @@ -35,25 +35,25 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ _maxSize = [keyed decodeSizeForKey: @"NSMaxSize"]; _minSize = [keyed decodeSizeForKey: @"NSMinSize"]; - _screenRect = + screenRect = [keyed decodeRectForKey: @"NSScreenRect"]; // screen created on _viewClass = [[keyed decodeObjectForKey: @"NSViewClass"] retain]; _wtFlags = [keyed decodeIntForKey: @"NSWTFlags"]; _windowBacking = [keyed decodeIntForKey: @"NSWindowBacking"]; _windowClass = [[keyed decodeObjectForKey: @"NSWindowClass"] retain]; - _windowRect = [keyed decodeRectForKey: @"NSWindowRect"]; + windowRect = [keyed decodeRectForKey: @"NSWindowRect"]; _windowStyleMask = [keyed decodeIntForKey: @"NSWindowStyleMask"]; _windowTitle = [[keyed decodeObjectForKey: @"NSWindowTitle"] retain]; - _windowView = [[keyed decodeObjectForKey: @"NSWindowView"] retain]; + windowView = [[keyed decodeObjectForKey: @"NSWindowView"] retain]; _windowAutosave = [[keyed decodeObjectForKey: @"NSFrameAutosaveName"] retain]; if ([NSScreen mainScreen]) - _windowRect.origin.y -= _screenRect.size.height - + windowRect.origin.y -= screenRect.size.height - [[NSScreen mainScreen] frame].size.height; if ([NSClassFromString(_windowClass) hasMainMenuForStyleMask: _windowStyleMask]) - _windowRect.origin.y -= [NSMainMenuView + windowRect.origin.y -= [NSMainMenuView menuHeight]; // compensation for the additional menu bar } else { [NSException raise: NSInvalidArgumentException @@ -67,7 +67,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ [_viewClass release]; [_windowClass release]; [_windowTitle release]; - [_windowView release]; + [windowView release]; [_windowAutosave release]; [super dealloc]; } @@ -85,7 +85,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class = [NSWindow class]; } defer = (_wtFlags & 0x20000000) ? YES : NO; - result = [[class alloc] initWithContentRect: _windowRect + result = [[class alloc] initWithContentRect: windowRect styleMask: _windowStyleMask backing: _windowBacking defer: defer]; @@ -96,9 +96,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ [result setHidesOnDeactivate: (_wtFlags & 0x80000000) ? YES : NO]; [result setTitle: _windowTitle]; - [result setContentView: _windowView]; - [_windowView setAutoresizesSubviews: YES]; - [_windowView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable]; + [result setContentView: windowView]; + [windowView setAutoresizesSubviews: YES]; + [windowView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable]; if ([_viewClass isKindOfClass: [NSToolbar class]]) { [result setToolbar: _viewClass]; diff --git a/AppKit/nib.subproj/UINibCoding.m b/AppKit/nib.subproj/UINibCoding.m new file mode 100644 index 00000000..6a351294 --- /dev/null +++ b/AppKit/nib.subproj/UINibCoding.m @@ -0,0 +1,18 @@ +#import + +@interface UINibEncoder : NSCoder +@end + +@implementation UINibEncoder + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/QuartzCore/CAFilter.m b/QuartzCore/CAFilter.m index e77ca0c1..67520b20 100644 --- a/QuartzCore/CAFilter.m +++ b/QuartzCore/CAFilter.m @@ -20,6 +20,9 @@ #import NSString *const kCAFilterColorMatrix = @"colorMatrix"; +NSString *const kCAFilterColorBrightness = @"colorBrightness"; +NSString *const kCAFilterColorHueRotate = @"colorHueRotate"; +NSString *const kCAFilterMultiplyBlendMode = @"multiplyBlendMode"; @implementation CAFilter diff --git a/QuartzCore/CATransformLayer.m b/QuartzCore/CATransformLayer.m new file mode 100644 index 00000000..444122cc --- /dev/null +++ b/QuartzCore/CATransformLayer.m @@ -0,0 +1,18 @@ +#import + +@interface CATransformLayer : NSObject +@end + +@implementation CATransformLayer + +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector +{ + return [NSMethodSignature signatureWithObjCTypes: "v@:"]; +} + +- (void)forwardInvocation:(NSInvocation *)anInvocation +{ + NSLog(@"Stub called: %@ in %@", NSStringFromSelector([anInvocation selector]), [self class]); +} + +@end diff --git a/QuartzCore/CMakeLists.txt b/QuartzCore/CMakeLists.txt index 12af921f..a2e32bf0 100644 --- a/QuartzCore/CMakeLists.txt +++ b/QuartzCore/CMakeLists.txt @@ -61,6 +61,7 @@ set(QuartzCore_sources CAMetalLayer.mm CAMetalDrawable.mm CASpringAnimation.m + CATransformLayer.m ) #set_source_files_properties(${QuartzCore_sources} LANGUAGE C)