From b4a222b226c3062e0c4d00deb649f436d152aa8f Mon Sep 17 00:00:00 2001
From: Marcian Lytwyn <gna@advcsi.com>
Date: Thu, 9 Jul 2015 16:38:45 +0000
Subject: [PATCH] Revert NSSavePanel code due to problems on new mingw/clang
 development environment

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38781 72102866-910b-0410-8b05-ffd578937521
---
 Headers/AppKit/NSSavePanel.h | 11 +--------
 Source/NSSavePanel.m         | 47 +++++-------------------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/Headers/AppKit/NSSavePanel.h b/Headers/AppKit/NSSavePanel.h
index f9fb64e1b..810db15d1 100644
--- a/Headers/AppKit/NSSavePanel.h
+++ b/Headers/AppKit/NSSavePanel.h
@@ -34,7 +34,6 @@
 #ifndef _GNUstep_H_NSSavePanel
 #define _GNUstep_H_NSSavePanel
 #import <GNUstepBase/GSVersionMacros.h>
-#import <GNUstepBase/GSBlocks.h>
 
 #import <AppKit/NSPanel.h>
 
@@ -59,7 +58,7 @@ enum {
 };
  
 @protocol NSOpenSavePanelDelegate <NSObject>
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
+#ifdef __OBJC2__
 @optional
 #else
 @end
@@ -82,7 +81,6 @@ enum {
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename;
 @end
 
-DEFINE_BLOCK_TYPE(GSSavePanelCompletionHandler, void, NSInteger);
 
 @interface NSSavePanel : NSPanel
 {
@@ -119,7 +117,6 @@ DEFINE_BLOCK_TYPE(GSSavePanelCompletionHandler, void, NSInteger);
   BOOL _OKButtonPressed;
 
   NSMenu *_showsHiddenFilesMenu;
-  GSSavePanelCompletionHandler _completionHandler;
 }
 
 /*
@@ -209,12 +206,6 @@ DEFINE_BLOCK_TYPE(GSSavePanelCompletionHandler, void, NSInteger);
 		    contextInfo: (void *)contextInfo;
 #endif
 
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
-- (void) beginSheetModalForWindow:(NSWindow *)window
-                completionHandler:(GSSavePanelCompletionHandler)handler;
-- (void) beginWithCompletionHandler:(GSSavePanelCompletionHandler)handler;
-#endif
-
 /*
  * Reading Save Information
  */
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index 9f9d866db..2f8bd65eb 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -55,7 +55,6 @@
 #import "AppKit/NSDragging.h"
 #import "AppKit/NSSavePanel.h"
 #import "AppKit/NSTextField.h"
-#import "AppKit/NSWindowController.h"
 #import "AppKit/NSWorkspace.h"
 
 #import "GSGuiPrivate.h"
@@ -859,9 +858,8 @@ selectCellWithString: (NSString*)title
 */
 - (void) setTitle: (NSString*)title
 {
-  // keep the window title in sync with the title field
-  [super setTitle:title];
   [_titleField setStringValue: title];
+  [super setTitle:title]; // keep the window title in sync with the title field
 
   // TODO: Improve the following by managing 
   // vertical alignment better.
@@ -1110,22 +1108,7 @@ selectCellWithString: (NSString*)title
  */
 - (NSInteger) runModal
 {
-  return [self runModalForDirectory: [self directory]
-                               file: [[self filename] lastPathComponent]];
-}
-
-- (void) beginSheetModalForWindow:(NSWindow *)window
-                completionHandler:(GSSavePanelCompletionHandler)handler
-{
-  NSInteger result = [NSApp runModalForWindow: self
-                             relativeToWindow: window];
-  CALL_BLOCK(handler, result);
-}
-
-- (void) beginWithCompletionHandler:(GSSavePanelCompletionHandler)handler
-{
-  self->_completionHandler = Block_copy(handler);
-  [self makeKeyAndOrderFront: self];
+  return [self runModalForDirectory: [self directory] file: [self filename]];
 }
 
 /**<p> Initializes the panel to the directory specified by path and,
@@ -1204,7 +1187,7 @@ selectCellWithString: (NSString*)title
 
   if (_allowedFileTypes == nil ||
       [_allowedFileTypes indexOfObject: @""] != NSNotFound)
-    return AUTORELEASE([_fullFileName copy]);
+    return _fullFileName;
 
   /* add file type extension if the file name does not have an extension or
      the file name's extension is not one of the allowed extensions and the
@@ -1219,7 +1202,7 @@ selectCellWithString: (NSString*)title
     }
   else
     {
-      return AUTORELEASE([_fullFileName copy]);
+      return _fullFileName;
     }
 }
 
@@ -1236,16 +1219,7 @@ selectCellWithString: (NSString*)title
 {
   ASSIGN(_directory, pathToColumn(_browser, [_browser lastColumn]));
   [self _updateDefaultDirectory];
-
-  if (self->_completionHandler == NULL)
-    [NSApp stopModalWithCode: NSCancelButton];
-  else
-    {
-      CALL_BLOCK(self->_completionHandler, NSCancelButton);
-      Block_release(self->_completionHandler);
-      self->_completionHandler = NULL;
-    }
-
+  [NSApp stopModalWithCode: NSCancelButton];
   [_okButton setEnabled: NO];
   [self close];
 }
@@ -1416,16 +1390,7 @@ selectCellWithString: (NSString*)title
       return;
 
   [self _updateDefaultDirectory];
-
-  if (self->_completionHandler == NULL)
-    [NSApp stopModalWithCode: NSOKButton];
-  else
-    {
-      CALL_BLOCK(self->_completionHandler, NSOKButton);
-      Block_release(self->_completionHandler);
-      self->_completionHandler = NULL;
-    }
-
+  [NSApp stopModalWithCode: NSOKButton];
   [_okButton setEnabled: NO];
   [self close];
 }