Author: mlytwyn
Date: Thu Jul 9 18:38:45 2015
New Revision: 38781
URL: http://svn.gna.org/viewcvs/gnustep?rev=38781&view=rev
Log:
Revert NSSavePanel code due to problems on new mingw/clang development
environment
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSSavePanel.h
libs/gui/branches/gnustep_testplant_branch/Source/NSSavePanel.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSSavePanel.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSSavePanel.h?rev=38781&r1=38780&r2=38781&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSSavePanel.h
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSSavePanel.h
Thu Jul 9 18:38:45 2015
@@ -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 @@
};
@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 @@
- (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename;
@end
-DEFINE_BLOCK_TYPE(GSSavePanelCompletionHandler, void, NSInteger);
@interface NSSavePanel : NSPanel
{
@@ -119,7 +117,6 @@
BOOL _OKButtonPressed;
NSMenu *_showsHiddenFilesMenu;
- GSSavePanelCompletionHandler _completionHandler;
}
/*
@@ -207,12 +204,6 @@
modalDelegate: (id)delegate
didEndSelector: (SEL)didEndSelector
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
/*
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSSavePanel.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSSavePanel.m?rev=38781&r1=38780&r2=38781&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSSavePanel.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSSavePanel.m Thu Jul
9 18:38:45 2015
@@ -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 @@
*/
- (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 @@
*/
- (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 @@
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 @@
}
else
{
- return AUTORELEASE([_fullFileName copy]);
+ return _fullFileName;
}
}
@@ -1236,16 +1219,7 @@
{
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 @@
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];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
