diff --git a/Headers/AppKit/NSPasteboard.h b/Headers/AppKit/NSPasteboard.h index 40188c3fa..e34c12fca 100644 --- a/Headers/AppKit/NSPasteboard.h +++ b/Headers/AppKit/NSPasteboard.h @@ -193,6 +193,10 @@ APPKIT_EXPORT NSString *const NSPasteboardTypeMultipleTextSelection; #if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST) APPKIT_EXPORT NSString *const NSPasteboardTypeTextFinderOptions; #endif + +#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST) +typedef NSString *NSPasteboardType; +#endif #endif diff --git a/Headers/AppKit/NSProgressIndicator.h b/Headers/AppKit/NSProgressIndicator.h index 13f3d8c81..6ee36316c 100644 --- a/Headers/AppKit/NSProgressIndicator.h +++ b/Headers/AppKit/NSProgressIndicator.h @@ -51,7 +51,11 @@ typedef enum _NSProgressIndicatorThickness typedef enum _NSProgressIndicatorStyle { NSProgressIndicatorBarStyle = 0, - NSProgressIndicatorSpinningStyle = 1 + NSProgressIndicatorSpinningStyle = 1, + #if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST) + NSProgressIndicatorStyleBar = 0, + NSProgressIndicatorStyleSpinning = 1 + #endif } NSProgressIndicatorStyle; APPKIT_EXPORT_CLASS diff --git a/Headers/AppKit/NSViewController.h b/Headers/AppKit/NSViewController.h index 04d2365fa..3498f9358 100644 --- a/Headers/AppKit/NSViewController.h +++ b/Headers/AppKit/NSViewController.h @@ -96,7 +96,12 @@ APPKIT_EXPORT_CLASS - (void) viewDidAppear: (BOOL)animated; - (void) viewWillDisappear: (BOOL)animated; - (void) viewDidDisappear: (BOOL)animated; - +#if OS_API_VERSION(MAC_OS_X_VERSION_10_10, GS_API_LATEST) +- (void) viewWillAppear; +- (void) viewDidAppear; +- (void) viewWillDisappear; +- (void) viewDidDisappear; +#endif #if OS_API_VERSION(MAC_OS_X_VERSION_10_10, GS_API_LATEST) - (void) dismissViewController: (NSViewController *)viewController; - (void) dismissController: (id)sender; diff --git a/Source/NSViewController.m b/Source/NSViewController.m index df46db2ad..b586ec777 100644 --- a/Source/NSViewController.m +++ b/Source/NSViewController.m @@ -83,6 +83,7 @@ - (void)viewDidLoad - (void) viewWillAppear: (BOOL)animated { + [self viewWillAppear]; } - (void) viewIsAppearing: (BOOL)animated @@ -91,13 +92,32 @@ - (void) viewIsAppearing: (BOOL)animated - (void) viewDidAppear: (BOOL)animated { + [self viewDidAppear]; } - (void) viewWillDisappear: (BOOL)animated { + [self viewWillDisappear]; } - (void) viewDidDisappear: (BOOL)animated +{ + [self viewDidDisappear]; +} + +- (void) viewWillAppear +{ +} + +- (void) viewWillDisappear +{ +} + +- (void) viewDidAppear +{ +} + +- (void) viewDidDisappear { }