Now compiles in Mac OS 10.5 or 10.6 SDK without warnings, other improvements and bug fixes

Author: jerrykrinock

GCUndoManager.m

@@ -167,12 +167,27 @@ - (void)				endUndoGrouping
 
 		if([self undoManagerState] == kGCUndoCollectingTasks)
 		{
+			// if this action is discardable, create userInfo indicating such
 			GCUndoGroup* topGroup = [self peekUndo] ;
 			NSDictionary* userInfo = nil ;
 			if ([topGroup actionIsDiscardable]) {
+				// If the deployment target is 10.7 or later, the NSUndoManagerGroupIsDiscardableKey global is available,
+				// otherwise we just rely on it's string value, which is unlikely to change.
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
 				userInfo = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:NSUndoManagerGroupIsDiscardableKey] ;
+#else
+				userInfo = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:@"NSUndoManagerGroupIsDiscardableKey"] ;
+#endif
 			}
-			[[NSNotificationCenter defaultCenter] postNotificationName:NSUndoManagerDidCloseUndoGroupNotification object:self userInfo:userInfo];
+
+			NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
+			// If the deployment target is 10.7 or later, the NSUndoManagerDidCloseUndoGroupNotification global is available,
+			// otherwise we just rely on it's string value, which is unlikely to change.
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+			[notificationCenter postNotificationName:NSUndoManagerDidCloseUndoGroupNotification object:self userInfo:userInfo];
+#else
+			[notificationCenter postNotificationName:@"NSUndoManagerDidCloseUndoGroupNotification" object:self userInfo:userInfo];
+#endif
 		}
 	}
 }

MAKVONotificationCenter.m

@@ -9,7 +9,14 @@
 
 #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) 
+// For some reason, this was not needed when I was using the 10.5 SDK
+#import <objc/objc-auto.h>
+#endif
 
 @interface MAKVObservation : NSObject
 {

NSFancyPanel.m

@@ -38,13 +38,13 @@ - (void) sendEvent:(NSEvent *) theEvent
     //	Offer key-down events to the delegats
     if ([theEvent type] == NSKeyDown)
         if ([[self delegate] respondsToSelector: @selector(handlesKeyDown:inWindow:)])
-            if ([[self delegate] handlesKeyDown: theEvent  inWindow: self])
+            if ([(id)[self delegate] handlesKeyDown: theEvent  inWindow: self])
                 return;
 
     //	Offer mouse-down events (lefty or righty) to the delegate
     if ( ([theEvent type] == NSLeftMouseDown) || ([theEvent type] == NSRightMouseDown) )
         if ([[self delegate] respondsToSelector: @selector(handlesMouseDown:inWindow:)])
-            if ([[self delegate] handlesMouseDown: theEvent  inWindow: self])
+            if ([(id)[self delegate] handlesMouseDown: theEvent  inWindow: self])
                 return;
 
     //	Delegate wasnÕt interested, so do the usual routing.

SSYAboutPanelController.h

@@ -4,7 +4,11 @@ extern NSString* const SSYAboutPanelHelpAnchorAcknowledgements ;
 
 @class ScrollingTextView;
 
-@interface SSYAboutPanelController : NSObject {
+@interface SSYAboutPanelController : NSObject 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+	<NSWindowDelegate>
+#endif
+{
     //	This panel exists in the nib file, but the user never sees it, because
     //	we rip out its contents and place them in “panelToDisplay”.
     IBOutlet NSPanel			*panelInNib;

SSYAlert.h

@@ -11,15 +11,31 @@ enum {
 /*!
  @brief    This is an addition to Apple's anonymous enumeration containing
  NSAlertDefaultReturn, NSAlertAlternateReturn, NSAlertOtherReturn and NSAlertErrorReturn.
+ 
+ @details  These values are reflected in the 'Sheep Systems Suite'
+ AppleScript terminology.  Any changes you make here should be reflected
+ in there.
 */
-enum {
-    SSYAlertRecoveryWasNoError         = 99,
-	SSYAlertRecoverySucceeded		   = 100,
-	SSYAlertRecoveryFailed             = 101,
-	SSYAlertRecoveryNotAttempted       = 102,
-	SSYAlertRecoveryWentAsynchronous   = 103,
-	//SSYAlertRecoveryReturnedToScripter = 104
+enum SSYAlertRecovery_enum {
+    SSYAlertRecoveryThereWasNoError          = 99,
+	SSYAlertRecoverySucceeded		         = 100,
+	SSYAlertRecoveryFailed                   = 101,
+	SSYAlertRecoveryNotAttempted             = 102,
+	SSYAlertRecoveryAttemptedAsynchronously  = 103,
+	SSYAlertRecoveryErrorIsHidden            = 104,
+	SSYAlertRecoveryUserCancelledPreviously  = 105
+} ;
+typedef enum SSYAlertRecovery_enum SSYAlertRecovery ;
+enum SSYAlertRecoveryApplescriptCode_enum {
+    SSYAlertRecoveryAppleScriptCodeThereWasNoError          = 'Nerr',
+	SSYAlertRecoveryAppleScriptCodeSucceeded		        = 'ReSx',
+	SSYAlertRecoveryAppleScriptCodeFailed                   = 'ReFa',
+	SSYAlertRecoveryAppleScriptCodeNotAttempted             = 'NoAt',
+	SSYAlertRecoveryAppleScriptCodeAttemptedAsynchronously  = 'AtAs',
+	SSYAlertRecoveryAppleScriptCodeErrorIsHidden            = 'ErHd',
+	SSYAlertRecoveryAppleScriptCodeUserCancelledPreviously  = 'UsCn'	
 } ;
+typedef enum SSYAlertRecoveryAppleScriptCode_enum SSYAlertRecoveryAppleScriptCode ;
 
 /*!
  @brief    Key used in the contextInfo sent to attemptRecoveryFromError:::::
@@ -113,8 +129,6 @@ extern NSString* const SSYAlertDidProcessErrorNotification ;
  displayed or no-op.
 
  @details  If error is nil, this method should return YES
- @param    error  
- @result   
 */
 - (BOOL)shouldHideError:(NSError*)error ;
 
@@ -612,14 +626,14 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  @result   If recovery was not attempted, will be NSAlertDefaultReturn, NSAlertAlternateReturn,
  or NSAlertOtherReturn depending on whether user clicked the first, second, or third button.
  If recovery was attempted, result will be SSYAlertRecoverySucceeded, SSYAlertRecoveryFailed,
- or SSYAlertRecoveryWentAsynchronous.
+ or SSYAlertRecoveryAttemptedAsynchronously.
  */
-- (int)alertError:(NSError*)error ;
+- (SSYAlertRecovery)alertError:(NSError*)error ;
 
 /*!
  @brief    Invokes -alertError: on the application's shared alert.
 */ 
-+ (int)alertError:(NSError*)error ;
++ (SSYAlertRecovery)alertError:(NSError*)error ;
 
 /*!
  @brief    Creates an alert sheet on a given window and displays a given

SSYAlert.m

@@ -454,6 +454,39 @@ + (NSButton*)newButton {
 
 #pragma mark * Private Methods
 
+/*!
+ @brief    Translates from the 'recovery option' as expressed in our -doLayoutError:
+ method to the 'recovery option index' expressed in Cocoa's error presentation method,
+ -presentError:.
+
+ @details  Cocoa's arrangement allows an unlimited number of error recovery options,
+ indexed from 0.  Our -doLayoutError: method only allows three options, which are
+ indexed like the buttons in NSAlert.  In particular, note that the values 
+ represented by 0 and 1 are reversed.
+*/
++ (NSUInteger)recoveryOptionIndexForRecoveryOption:(NSInteger)recoveryOption {
+	NSUInteger recoveryOptionIndex ;
+	switch (recoveryOption) {
+		case NSAlertDefaultReturn /* 1 */ :
+			recoveryOptionIndex = 0 ;
+			break;
+		case NSAlertAlternateReturn /* 0 */ :
+			recoveryOptionIndex = 1 ;
+			break;
+		case NSAlertOtherReturn /* -1 */ :
+			recoveryOptionIndex = 2 ;
+			break;
+		default:
+			// This should never happen since we only have 3 buttons and return
+			// one of the above three values like NSAlert.
+			NSLog(@"Warning 520-3840 %d", recoveryOption) ;
+			recoveryOptionIndex = recoveryOption ;
+			break;
+	}
+	
+	return recoveryOptionIndex ;
+}
+
 + (NSInteger)tryRecoveryAttempterForError:(NSError*)error
 						   recoveryOption:(NSUInteger)recoveryOption
 							  contextInfo:(NSMutableDictionary*)infoDictionary {
@@ -471,29 +504,70 @@ + (NSInteger)tryRecoveryAttempterForError:(NSError*)error
 			NSInvocation* invocation = [error didRecoverInvocation] ;
 			id delegate = [invocation target] ;
 			SEL didRecoverSelector = [invocation selector] ;
-			// It seems that the "Cocoa way" of recovering, using the delegate and
-			// didRecoverSelector, only works if didRecoverSelector has no arguments.
-			// That's why I put the whole invocation into the context info.  I believe
-			// it's alot cleaner anyhow.
+			// I put the whole invocation into the context info, believing it to be alot cleaner.
 			if (invocation) {
 				// Before we invoke the didRecoverInvocation, we also put it into the
 				// current infoDictionary in case an error occurs again and we need
 				// to re-recover.
 				[infoDictionary setObject:invocation
 								   forKey:SSYAlertDidRecoverInvocationKey] ;
 			}
-			[recoveryAttempter attemptRecoveryFromError:[[error retain] autorelease]
+			[recoveryAttempter attemptRecoveryFromError:[[deepestRecoverableError retain] autorelease]
 										 recoveryOption:recoveryOption
 											   delegate:delegate   
 									 didRecoverSelector:didRecoverSelector
 											contextInfo:[[infoDictionary retain] autorelease]] ;
 			// Also, the retain] autorelease] is probably not necessary since I'm invoking attemptRecoveryFromError:::::
 			// directly, but I'm always fearful of crashes due to invalid contextInfo.
-			result = SSYAlertRecoveryWentAsynchronous ;
+			result = SSYAlertRecoveryAttemptedAsynchronously ;
+		}
+		else if ([recoveryAttempter respondsToSelector:@selector(attemptRecoveryFromError:optionIndex:delegate:didRecoverSelector:contextInfo:)]) {
+			/* This is an error produced by Cocoa.
+			 In particular, in Mac OS X 10.7, it might be one like this:
+			 Error Domain = NSCocoaErrorDomain
+			 Code = 67000
+			 UserInfo = {
+			 •   NSLocalizedRecoverySuggestion=Click Save Anyway to keep your changes and save the
+			 changes made by the other application as a version, or click Revert to keep the changes from the other
+			 application and save your changes as a version.
+			 •   NSLocalizedFailureReason=The file has been changed by another application.
+			 •   NSLocalizedDescription=This document’s file has been changed by another application.
+			 •   NSLocalizedRecoveryOptions = ("Save Anyway", "Revert")
+			 }
+			*/
+			NSInvocation* invocation = [error didRecoverInvocation] ;
+			id delegate = [invocation target] ;
+			SEL didRecoverSelector = [invocation selector] ;
+			// I put the whole invocation into the context info, believing it to be alot cleaner.
+			if (invocation) {
+				// Before we invoke the didRecoverInvocation, we also put it into the
+				// current infoDictionary in case an error occurs again and we need
+				// to re-recover.
+				[infoDictionary setObject:invocation
+								   forKey:SSYAlertDidRecoverInvocationKey] ;
+			}
+			NSInteger recoveryOptionIndex = [self recoveryOptionIndexForRecoveryOption:recoveryOption] ;
+			
+			[recoveryAttempter attemptRecoveryFromError:[[deepestRecoverableError retain] autorelease]
+											optionIndex:recoveryOptionIndex
+											   delegate:delegate   
+									 didRecoverSelector:didRecoverSelector
+											contextInfo:[[infoDictionary retain] autorelease]] ;
+			// Also, the retain] autorelease] is probably not necessary since I'm invoking attemptRecoveryFromError:::::
+			// directly, but I'm always fearful of crashes due to invalid contextInfo.
+			result = SSYAlertRecoveryAttemptedAsynchronously ;
 		}
 		else if ([recoveryAttempter respondsToSelector:@selector(attemptRecoveryFromError:recoveryOption:)]) {
-			BOOL ok = [recoveryAttempter attemptRecoveryFromError:error
-													  recoveryOption:recoveryOption] ;
+			BOOL ok = [recoveryAttempter attemptRecoveryFromError:deepestRecoverableError
+												   recoveryOption:recoveryOption] ;
+			
+			result = ok ? SSYAlertRecoverySucceeded : SSYAlertRecoveryFailed ;
+		}
+		else if ([recoveryAttempter respondsToSelector:@selector(attemptRecoveryFromError:optionIndex:)]) {
+			// This is an error produced by Cocoa.
+			NSInteger recoveryOptionIndex = [self recoveryOptionIndexForRecoveryOption:recoveryOption] ;
+			BOOL ok = [recoveryAttempter attemptRecoveryFromError:deepestRecoverableError
+													  optionIndex:recoveryOptionIndex] ;
 
 			result = ok ? SSYAlertRecoverySucceeded : SSYAlertRecoveryFailed ;
 		}
@@ -1900,19 +1974,20 @@ - (void)alertError:(NSError*)error
 	[self noteError:error] ;
 }
 
-- (int)alertError:(NSError*)error {
+- (SSYAlertRecovery)alertError:(NSError*)error {
 	if (!error) {
-		return SSYAlertRecoveryWasNoError ;
+		return SSYAlertRecoveryThereWasNoError ;
 	}
 
-	int alertReturn_ = NSAlertErrorReturn ;
+	int alertReturn ;
 
-	if (
-		![gSSYAlertErrorHideManager shouldHideError:error]
-		&&
-		!(([[error domain] isEqualToString:NSCocoaErrorDomain]) && ([error code] == NSUserCancelledError))
-		) {
-		
+	if ([gSSYAlertErrorHideManager shouldHideError:error]) {
+		alertReturn = SSYAlertRecoveryErrorIsHidden ;
+	}
+	else if ([[error domain] isEqualToString:NSCocoaErrorDomain] && ([error code] == NSUserCancelledError)) {
+		alertReturn = SSYAlertRecoveryAppleScriptCodeUserCancelledPreviously ;
+	}
+	else {
 		[self doLayoutError:error] ;
 		[self display] ;
 
@@ -1923,26 +1998,26 @@ - (int)alertError:(NSError*)error {
 		[NSApp runModalForWindow:[self window]] ;
 		// Will block here until user clicks a button
 
-		alertReturn_ = [self alertReturn] ;
+		alertReturn = [self alertReturn] ;
 		NSInteger recoveryResult = [SSYAlert tryRecoveryAttempterForError:error
-														   recoveryOption:alertReturn_
+														   recoveryOption:alertReturn
 															  contextInfo:nil] ;
 		if (recoveryResult != SSYAlertRecoveryNotAttempted) {
-			alertReturn_ = recoveryResult ;
+			alertReturn = recoveryResult ;
 		}
 	}
 
 	[self noteError:error] ;
 
-	return alertReturn_ ;
+	return alertReturn ;
 }
 
-+ (int)alertError:(NSError*)error {
++ (SSYAlertRecovery)alertError:(NSError*)error {
 	// In BookMacster 1.1.10, I found that Core Data migration, specifically
 	// -[Bkmx007-008MigrationPolicy createDestinationInstancesForSourceInstance:::]
 	// was spending 99% of its time creating SSYAlerts for nil errors!  Fix…
 	if (!error) {
-		return SSYAlertRecoveryWasNoError ;
+		return SSYAlertRecoveryThereWasNoError ;
 	}
 
 	return [[SSYAlert alert] alertError:error] ;

SSYAlertSounder.h

@@ -16,6 +16,12 @@
 	NSMutableDictionary* m_soundIds ;
 }
 
+/*!
+ @brief    Plays a desired sound
+
+ @details  
+ @param    name  The name of a sound file, not including the .aiff extension.
+*/
 - (void)playAlertSoundNamed:(NSString*)name ;
 
 + (SSYAlertSounder*)sharedSounder ;