• Removed the ivar documentWindow from SSYAlert because, since macOS 10.9 and some earlier commit, we now have -[NSWindow sheetParent] and are not using it. Also changed names of such local variables to sheetParent, to match the new Apple symbology.

Author: jerrykrinock

SSYAlert.h

@@ -389,7 +389,6 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
 	NSButton* buttonPrototype ;
 	NSString* wordAlert ;
 	NSString* m_whyDisabled ;
-	NSWindow* documentWindow ;
 	NSInvocation* m_checkboxInvocation ;
 
 	BOOL m_isEnabled ;
@@ -461,13 +460,6 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  */
 @property (copy) NSString* whyDisabled ;
 
-/*!
- @brief    A stupid patch for the fact that when a modal sheet ends,
- the action method only gives me the button and not the documentWindow
- or its sheet which I need to forward to endSheet:.
- */
-@property (retain) NSWindow* documentWindow ;
-
 /*!
  @brief    Indicates which button was last clicked
  
@@ -791,8 +783,8 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  This method also posts an SSYAlertDidProcessErrorNotification, unless 
  the error -isOnlyInformational.
  
- @param    error  The error to be presented, or nil.
- @param    documentWindow  The document window to which to attach the sheet.
+ @param    error  The error to be presented, or nil
+ @param    sheetParent  The window upon which to attach the sheet
  @param    modalDelegate  The object which will receive and must respond to
  the didEndSelector, or nil if you want the receiver to handle it.  If the
  receiver handles it, its alertReturn will be set to the NSAlertReturn value
@@ -803,10 +795,10 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  to make the sheet go away, the didEndSelector must send -orderOut: to the
  'sheet' argument it receives.
  @param    contextInfo  Pointer to data which will be returned as the
- third element of the didEndSelector.
+ third element of the didEndSelector
  */
 + (void)alertError:(NSError*)error
-		  onWindow:(NSWindow*)documentWindow
+		  onWindow:(NSWindow*)sheetParent
 	 modalDelegate:(id)modalDelegate
 	didEndSelector:(SEL)didEndSelector
 	   contextInfo:(void*)contextInfo ;

SSYAlert.m

@@ -375,7 +375,6 @@ - (void)setClickObject:(id)value {
 @synthesize iconCritical ;
 @synthesize buttonPrototype ;
 @synthesize wordAlert ;
-@synthesize documentWindow ;
 
 @synthesize isVisible ;
 @synthesize nDone ;
@@ -1433,7 +1432,7 @@ - (void)setButton1IfNeeded {
 	}
 }
 
-- (void)prepareAsSheetOnWindow:(NSWindow*)docWindow {
+- (void)prepareAsSheetOnWindow:(NSWindow*)sheetParent {
     [self setButton1IfNeeded] ;
 
     /* Button1 target and action should always be set by setButton1Title: */
@@ -1451,7 +1450,7 @@ - (void)prepareAsSheetOnWindow:(NSWindow*)docWindow {
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(parentWindowWillClose:)
                                                  name:NSWindowWillCloseNotification
-                                               object:docWindow] ;
+                                               object:sheetParent] ;
 
     [self doooLayout] ;
 
@@ -1460,8 +1459,6 @@ - (void)prepareAsSheetOnWindow:(NSWindow*)docWindow {
     }
 
     [self setIsDoingModalDialog:YES] ;
-    
-    [self setDocumentWindow:docWindow] ;
 }
 
 - (void)parentWindowWillClose:(NSNotification*)note {
@@ -1478,11 +1475,11 @@ - (void)runModalSheetOnWindow:(NSWindow*)docWindow
     }
 }
 
-- (void)runModalSheetOnWindow:(NSWindow*)docWindow
+- (void)runModalSheetOnWindow:(NSWindow*)sheetParent
                 modalDelegate:(id)modalDelegate
                didEndSelector:(SEL)didEndSelector
                   contextInfo:(void*)contextInfo {
-	if (docWindow) {
+	if (sheetParent) {
         NSAssert(((modalDelegate != nil) == (didEndSelector != nil)), @"222 modalDelegate vs. didEndSelector inconsistency.") ;
         if (!modalDelegate) {
             modalDelegate = self ;
@@ -1492,9 +1489,9 @@ - (void)runModalSheetOnWindow:(NSWindow*)docWindow
             didEndSelector = @selector(sheetDidEnd:returnCode:contextInfo:) ;
         }
 
-        [self prepareAsSheetOnWindow:docWindow];
+        [self prepareAsSheetOnWindow:sheetParent];
 
-        [docWindow beginSheet:[self window]
+        [sheetParent beginSheet:[self window]
             completionHandler:^void(NSModalResponse modalResponse) {
                 NSWindow* window = [self window] ;
                 NSInvocation* invocation = [NSInvocation invocationWithTarget:modalDelegate
@@ -2122,8 +2119,6 @@ - (void)goAway {
                                                           object:self.window.sheetParent] ;
         }
 
-        [self setDocumentWindow:nil] ;
-        
         if (self.window) {
             [self.window.sheetParent endSheet:self.window
                                    returnCode:[self alertReturn]] ;
@@ -2377,7 +2372,7 @@ - (void)alertError:(NSError*)error
 }
 
 - (void)alertError:(NSError*)error
-		  onWindow:(NSWindow*)documentWindow_
+		  onWindow:(NSWindow*)sheetParent
 	 modalDelegate:(id)modalDelegate
 	didEndSelector:(SEL)didEndSelector
 	   contextInfo:(void*)contextInfo {
@@ -2405,7 +2400,7 @@ - (void)alertError:(NSError*)error
 			didEndSelector = @selector(errorSheetDidEnd:returnCode:contextInfo:) ;
 		}
 
-		[self runModalSheetOnWindow:documentWindow_
+		[self runModalSheetOnWindow:sheetParent
 					  modalDelegate:modalDelegate
 					 didEndSelector:didEndSelector
 						contextInfo:contextInfo] ;		
@@ -2472,7 +2467,7 @@ + (SSYAlertRecovery)alertError:(NSError*)error {
 }
 
 + (void)alertError:(NSError*)error
-		  onWindow:(NSWindow*)documentWindow_
+		  onWindow:(NSWindow*)sheetParent
 	 modalDelegate:(id)modalDelegate
 	didEndSelector:(SEL)didEndSelector
 	   contextInfo:(void*)contextInfo {
@@ -2481,7 +2476,7 @@ + (void)alertError:(NSError*)error
 	SSYAlert* alert = [SSYAlert alert] ;
 
 	[alert alertError:error
-			 onWindow:documentWindow_
+			 onWindow:sheetParent
 		modalDelegate:modalDelegate
 	   didEndSelector:didEndSelector
 		  contextInfo:contextInfo] ;
@@ -2570,7 +2565,6 @@ - (void)dealloc {
 	[iconCritical release] ;
 	[buttonPrototype release] ;
 	[wordAlert release] ;
-	[documentWindow release] ;
 	[otherSubviews release] ;
 	[clickTarget release] ;
 	[clickObject release] ;