Merge pull request #371 from gnustep/NSAlert_branch

Update to include function to open an alert panel relative to a window

Author: gcasa

Headers/AppKit/NSPanel.h

@@ -123,6 +123,15 @@ APPKIT_EXPORT NSInteger NSRunAlertPanel(NSString *title,
                                         NSString *alternateButton,
                                         NSString *otherButton, ...);
 
+// Synchronous alert that is displayed as a sheet attached to the provided
+// window. If docWindow is nil it falls back to NSRunAlertPanel.
+APPKIT_EXPORT NSInteger NSRunAlertPanelRelativeToWindow(NSString *title,
+                                                        NSString *msg,
+                                                        NSString *defaultButton,
+                                                        NSString *alternateButton,
+                                                        NSString *otherButton,
+							NSWindow *docWindow, ...);
+
 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
 APPKIT_EXPORT NSInteger NSRunCriticalAlertPanel(NSString *title,
                                                 NSString *msg,

Source/NSAlert.m

@@ -1770,6 +1770,64 @@ void NSBeginInformationalAlertSheet(NSString *title,
   NSReleaseAlertPanel(panel);
 }
 
+// Synchronous sheet-aware alert. If docWindow is nil, fall back to
+// NSRunAlertPanel which shows a modal alert. Otherwise display a sheet
+// attached to docWindow and run a modal loop until it completes.
+NSInteger
+NSRunAlertPanelRelativeToWindow(NSString *title,
+				NSString *msg,
+				NSString *defaultButton,
+				NSString *alternateButton,
+				NSString *otherButton,
+				NSWindow *docWindow, ...)
+{
+  va_list ap;
+  NSString *message = nil;
+  GSAlertPanel *panel = nil;
+  NSInteger result = 0;
+
+  va_start(ap, docWindow);
+  message = [NSString stringWithFormat: msg arguments: ap];
+  va_end(ap);
+
+  // Set the default button...
+  if (defaultButton == nil)
+    {
+      defaultButton = @"OK";
+    }
+
+  // Show a panel or a sheet depending on if we have a window...
+  if (docWindow == nil)
+    {
+      panel = getSomePanel(&standardAlertPanel,
+			   defaultTitle,
+			   title,
+			   message,
+                           defaultButton, alternateButton, otherButton);
+
+      result = [panel runModal];
+    }
+  else
+    {
+      panel = getSomeSheet(&informationalAlertPanel,
+			   defaultTitle,
+			   title,
+			   message,
+			   defaultButton, alternateButton, otherButton);
+
+      [NSApp beginSheet: panel
+	 modalForWindow: docWindow
+	  modalDelegate: nil
+	 didEndSelector: NULL
+	    contextInfo: NULL];
+      
+      result = [panel result];
+    }
+
+  NSReleaseAlertPanel(panel);
+  return result;
+}
+
 
 @implementation	NSAlert