Improved use of availability macros

jerrykrinock · jerrykrinock · commit ec3bc44e15b6 · 2011-09-02T23:56:10.000-07:00
Surprisingly, to work around the problem that older SDKs don't know the
MAC_OS_X_VERSION… constants for *future* Mac OS X versions; i.e. that
they are not "forward compatible", I recently read that Apple recommends
hard coding the constants, i.e. 1060 for 10.6, etc.  So I do it that way
now.  I must admit that it does make things much simpler!
diff --git a/MAKVONotificationCenter.m b/MAKVONotificationCenter.m
@@ -9,11 +9,8 @@
 
 #import <libkern/OSAtomic.h>
 #import <objc/message.h>
-/*
- If you are developing with the 10.5 SDK, MAC_OS_X_VERSION_MAX_ALLOWED = 1050, MAC_OS_X_VERSION_10_5 = 1050 and the following #if will be true.
- If you are developing with the 10.6 SDK, MAC_OS_X_VERSION_MAX_ALLOWED = 1060, MAC_OS_X_VERSION_10_5 = 1050 and the following #if will be false.
- */
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 // For some reason, this was not needed when I was using the 10.5 SDK
 #import <objc/objc-auto.h>
 #endif
diff --git a/SSYAboutPanelController.h b/SSYAboutPanelController.h
@@ -5,7 +5,7 @@ extern NSString* const SSYAboutPanelHelpAnchorAcknowledgements ;
 @class ScrollingTextView;
 
 @interface SSYAboutPanelController : NSObject 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
 	<NSWindowDelegate>
 #endif
 {
diff --git a/SSYAlert.m b/SSYAlert.m
@@ -572,7 +572,7 @@ + (NSInteger)tryRecoveryAttempterForError:(NSError*)error
 			result = ok ? SSYAlertRecoverySucceeded : SSYAlertRecoveryFailed ;
 		}
 		else {
-			NSLog(@"Internal Error 342-5587.  Given Recovery Attempter %@ does not respond to either attemptRecoveryFromError:... method", recoveryAttempter) ;
+			NSLog(@"Internal Error 342-5587.  Given Recovery Attempter %@ does not respond to any attemptRecoveryFromError:... method", recoveryAttempter) ;
 		}
 	}
 	else if (docOpeningError) {
diff --git a/SSYDocFileObserver.m b/SSYDocFileObserver.m
@@ -141,7 +141,7 @@ - (void)dealloc {
 - (void)pathChangedNote:(NSNotification*)note {
 	// No need to look at flags since we registered for only SSYPathObserverChangeFlagsRename.
 	
-#if 1
+#if 0
 #warning Debugging SSYDocFileObserver
 	NSLog(@"Received notification of filesystem change:\n"
 		  "   Path:           %@\n"
diff --git a/SSYDynamicMenu.h b/SSYDynamicMenu.h
@@ -51,7 +51,7 @@
  variables for the current represented objects and selected represented object.
  */
 @interface SSYDynamicMenu : NSMenu
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSMenuDelegate> 
 #endif
 {
diff --git a/SSYHintableWindow.m b/SSYHintableWindow.m
@@ -8,5 +8,73 @@ - (void)sendEvent:(NSEvent *)event {
 	[super sendEvent:event] ;
 }
 
+#if 0
+#warning Experimenting : Windowless
+
+- (void)displayIfNeeded {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super displayIfNeeded] ;
+}
+
+
+- (void)display {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super display] ;
+}
+
+- (void)orderFrontRegardless {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super orderFrontRegardless] ;
+}
+
+- (void)orderFront:(id)sender {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super display] ;
+}
+
+- (void)orderBack:(id)sender {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super orderFront:sender] ;
+}
+
+- (void)makeMainWindow {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super makeMainWindow] ;
+}
+
+- (void)makeKeyWindow {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super makeKeyWindow] ;
+}
+
+- (void)makeKeyAndOrderFront:(id)sender {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super makeKeyAndOrderFront:sender] ;
+}
+
+- (void)orderWindow:(NSWindowOrderingMode)orderingMode relativeTo:(NSInteger)otherWindowNumber {
+	if (WINDOWLESS) {
+		return ;
+	}
+	[super orderWindow:orderingMode relativeTo:otherWindowNumber] ;
+}
+
+#endif
 
 @end
diff --git a/SSYLabelledList.h b/SSYLabelledList.h
@@ -10,7 +10,7 @@
  @details  May be used, for example for a user to select several items from a list.
  */
 @interface SSYLabelledList : NSView
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSTableViewDataSource, NSTableViewDelegate>
 #endif
 {
diff --git a/SSYLabelledTextField.h b/SSYLabelledTextField.h
@@ -8,7 +8,7 @@
  <i>Favorite Animal</i>, etc. etc.  Any single line of text.
 */
 @interface SSYLabelledTextField : NSControl
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSTextFieldDelegate>
 #endif
 {
diff --git a/SSYLaunchdGuy.m b/SSYLaunchdGuy.m
@@ -21,7 +21,7 @@ + (NSString*)homeLaunchAgentsPath {
 
 
 + (NSSet*)installedLaunchdAgentLabelsWithPrefix:(NSString*)prefix {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 	NSArray* allAgentNames = [[NSFileManager defaultManager] directoryContentsAtPath:[self homeLaunchAgentsPath]] ;
 #else
 	NSError* error = nil ;
@@ -190,7 +190,7 @@ + (BOOL)removeAgentsWithPrefix:(NSString*)prefix
 	BOOL ok = YES ;
 	NSString* myAgentDirectory = [self homeLaunchAgentsPath] ;
 	
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 	NSArray* existingFilenames = [[NSFileManager defaultManager] directoryContentsAtPath:myAgentDirectory] ;
 #else
 	NSError* error = nil ;
@@ -281,7 +281,7 @@ + (BOOL)addAgentInfo:(NSDictionary*)dic
 	NSDictionary* attributes = [NSDictionary dictionaryWithObject:octal644
 														   forKey:NSFilePosixPermissions] ;
 	NSError* error = nil ;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 	ok =[[NSFileManager defaultManager] changeFileAttributes:attributes
 													  atPath:path] ;
 #else
diff --git a/SSYMOCManager.m b/SSYMOCManager.m
@@ -134,11 +134,7 @@ - (void)attemptRecoveryFromError:(NSError*)error
 			// that the destination not already exist, so we must "remove" it first.
 			NSFileManager* fm = [NSFileManager defaultManager] ;
 
-			/*
-			 If you are developing with the 10.5 SDK, MAC_OS_X_VERSION_MAX_ALLOWED = 1050, MAC_OS_X_VERSION_10_5 = 1050 and the following #if will be true.
-			 If you are developing with the 10.6 SDK, MAC_OS_X_VERSION_MAX_ALLOWED = 1060, MAC_OS_X_VERSION_10_5 = 1050 and the following #if will be false.
-			 */
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 			[fm removeFileAtPath:newPath
 						 handler:nil] ;
 			BOOL ok = [fm movePath:oldPath
@@ -207,7 +203,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 		NSError* error = nil ;
 		if (ok && ((fileExists && !isDirectory) || !fileExists)) {
 			// Create parent directory
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 			ok = [fm createDirectoryAtPath:parentPath
 								attributes:nil] ;
 #else
diff --git a/SSYNetServiceResolver.h b/SSYNetServiceResolver.h
@@ -14,7 +14,7 @@ enum SSYNetServiceResolverState_enum {
 typedef enum SSYNetServiceResolverState_enum SSYNetServiceResolverState ;
 
 @interface SSYNetServiceResolver : NSObject
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSNetServiceDelegate>
 #endif
 {
diff --git a/SSYNetServicesSearcher.h b/SSYNetServicesSearcher.h
@@ -16,7 +16,7 @@ enum SSYNetServicesSearcherState_enum {
 typedef enum SSYNetServicesSearcherState_enum SSYNetServicesSearcherState ;
 
 @interface SSYNetServicesSearcher : NSObject
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSNetServiceBrowserDelegate>
 #endif
 {
diff --git a/SSYOtherApper.m b/SSYOtherApper.m
@@ -4,8 +4,8 @@
 #import "NSString+SSYExtraUtils.h"
 #import "NSFileManager+SomeMore.h"
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) \
-|| (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)
+
 /*!
 @brief    Declares stuff which is defined in the 10.6 SDK,
 to eliminate compiler warnings.
@@ -24,6 +24,7 @@ + (id)propertyListWithData:(NSData*)data
 					 error:(NSError**)error ;
 
 @end
+
 #endif
 
 NSString* const SSYOtherApperErrorDomain = @"SSYOtherApperErrorDomain" ;
diff --git a/SSYPathObserver.h b/SSYPathObserver.h
@@ -8,7 +8,7 @@
 
 
 // See class documentation 
-#define KQUEUES_WATCHER_THREAD_NEEDS_KILL_TO_EXIT (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5)
+#define KQUEUES_WATCHER_THREAD_NEEDS_KILL_TO_EXIT (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)
 
 
 /*!
diff --git a/SSYPersistentDocumentMultiMigrator.m b/SSYPersistentDocumentMultiMigrator.m
@@ -4,6 +4,7 @@
 #import "SSYSuperFileManager.h"
 #import "NSError+SSYAdds.h"
 #import "NSString+MorePaths.h"
+#import "NSDocument+SyncModDate.h"
 
 NSString* const SSYPersistentDocumentMultiMigratorErrorDomain = @"SSYPersistentDocumentMultiMigratorErrorDomain" ;
 NSString* const SSYPersistentDocumentMultiMigratorDidBeginMigrationNotification = @"SSYPersistentDocumentMultiMigratorDidBeginMigrationNotification" ;
diff --git a/SSYPrefsWindowController.h b/SSYPrefsWindowController.h
@@ -1,5 +1,5 @@
 @interface SSYPrefsWindowController : NSWindowController
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) 
 	<NSToolbarDelegate>
 #endif
 {
diff --git a/SSYPrefsWindowController.m b/SSYPrefsWindowController.m
@@ -226,11 +226,13 @@ -(NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSStrin
 		automagically select the appropriate item when it is clicked.
    -------------------------------------------------------------------------- */
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+
 -(NSArray*) toolbarSelectableItemIdentifiers: (NSToolbar*)toolbar
 {
 	return [itemsList allKeys];
 }
+
 #endif
 
 
diff --git a/SSYSqliter.m b/SSYSqliter.m
@@ -768,7 +768,7 @@ - (NSArray*)allPrimaryKeysInTable:(NSString*)table
 - (BOOL)checkpointAndCloseError_p:(NSError**)error_p {
 	if (!m_db) {
 		return YES ;
-		// because sqlite3_wal_checkpoint(NULL, NULL) will crash
+	    // because sqlite3_wal_checkpoint(NULL, NULL) will crash
 	}
 	
 	int result ;
diff --git a/SSYSuperFileManager.m b/SSYSuperFileManager.m
@@ -235,7 +235,7 @@ - (BOOL)fileExistsAtPath:(NSString*)path
 - (BOOL)canExecutePath:(NSString *)fullPath
 			   groupID:(uid_t)groupID
 				userID:(uid_t)userID {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) 
 	NSDictionary* attributes = [self fileAttributesAtPath:fullPath
 											 traverseLink:YES] ;
 #else

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ extern NSString* const SSYAboutPanelHelpAnchorAcknowledgements ;`
`5`	`5`	`@class ScrollingTextView;`
`6`	`6`
`7`	`7`	`@interface SSYAboutPanelController : NSObject`
`8`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`8`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`9`	`9`	`<NSWindowDelegate>`
`10`	`10`	`#endif`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ + (NSInteger)tryRecoveryAttempterForError:(NSError*)error`
`572`	`572`	`result = ok ? SSYAlertRecoverySucceeded : SSYAlertRecoveryFailed ;`
`573`	`573`	`}`
`574`	`574`	`else {`
`575`		`- NSLog(@"Internal Error 342-5587. Given Recovery Attempter %@ does not respond to either attemptRecoveryFromError:... method", recoveryAttempter) ;`
	`575`	`+ NSLog(@"Internal Error 342-5587. Given Recovery Attempter %@ does not respond to any attemptRecoveryFromError:... method", recoveryAttempter) ;`
`576`	`576`	`}`
`577`	`577`	`}`
`578`	`578`	`else if (docOpeningError) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`variables for the current represented objects and selected represented object.`
`52`	`52`	`*/`
`53`	`53`	`@interface SSYDynamicMenu : NSMenu`
`54`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`54`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`55`	`55`	`<NSMenuDelegate>`
`56`	`56`	`#endif`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`@details May be used, for example for a user to select several items from a list.`
`11`	`11`	`*/`
`12`	`12`	`@interface SSYLabelledList : NSView`
`13`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`13`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`14`	`14`	`<NSTableViewDataSource, NSTableViewDelegate>`
`15`	`15`	`#endif`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`<i>Favorite Animal</i>, etc. etc. Any single line of text.`
`9`	`9`	`*/`
`10`	`10`	`@interface SSYLabelledTextField : NSControl`
`11`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`11`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`12`	`12`	`<NSTextFieldDelegate>`
`13`	`13`	`#endif`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ enum SSYNetServiceResolverState_enum {`
`14`	`14`	`typedef enum SSYNetServiceResolverState_enum SSYNetServiceResolverState ;`
`15`	`15`
`16`	`16`	`@interface SSYNetServiceResolver : NSObject`
`17`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`17`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`18`	`18`	`<NSNetServiceDelegate>`
`19`	`19`	`#endif`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ enum SSYNetServicesSearcherState_enum {`
`16`	`16`	`typedef enum SSYNetServicesSearcherState_enum SSYNetServicesSearcherState ;`
`17`	`17`
`18`	`18`	`@interface SSYNetServicesSearcher : NSObject`
`19`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`19`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`20`	`20`	`<NSNetServiceBrowserDelegate>`
`21`	`21`	`#endif`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@interface SSYPrefsWindowController : NSWindowController`
`2`		`-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)`
	`2`	`+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)`
`3`	`3`	`<NSToolbarDelegate>`
`4`	`4`	`#endif`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -226,11 +226,13 @@ -(NSToolbarItem ) toolbar: (NSToolbar )toolbar itemForItemIdentifier: (NSStrin`
`226`	`226`	`automagically select the appropriate item when it is clicked.`
`227`	`227`	`-------------------------------------------------------------------------- */`
`228`	`228`
`229`		`-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3`
	`229`	`+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030`
	`230`	`+`
`230`	`231`	`-(NSArray) toolbarSelectableItemIdentifiers: (NSToolbar)toolbar`
`231`	`232`	`{`
`232`	`233`	`return [itemsList allKeys];`
`233`	`234`	`}`
	`235`	`+`
`234`	`236`	`#endif`
`235`	`237`
`236`	`238`
Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ - (NSArray)allPrimaryKeysInTable:(NSString)table`
`768`	`768`	`- (BOOL)checkpointAndCloseError_p:(NSError**)error_p {`
`769`	`769`	`if (!m_db) {`
`770`	`770`	`return YES ;`
`771`		`- // because sqlite3_wal_checkpoint(NULL, NULL) will crash`
	`771`	`+ // because sqlite3_wal_checkpoint(NULL, NULL) will crash`
`772`	`772`	`}`
`773`	`773`
`774`	`774`	`int result ;`