gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge GUI with trunk revision 40072

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40120 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-04 22:24:37 +00:00
parent a1d62943a6
commit 189ee17b08
4 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/AppKit/NSOpenPanel.h
View file

@ -7,9 +7,9 @@
Author: Scott Christley <scottc@net-community.com>
Date: 1996
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
Author: Daniel Bšhringer <boehring@biomed.ruhr-uni-bochum.de>
Date: August 1998
Source by Daniel Böhringer integrated into Scott Christley's preliminary
Source by Daniel Bšhringer integrated into Scott Christley's preliminary
implementation by Felipe A. Rodriguez <far@ix.netcom.com>
Author: Nicola Pero <n.pero@mi.flashnet.it>

2
Headers/AppKit/NSParagraphStyle.h
View file

@ -6,7 +6,7 @@
Copyright (C) 1996,1999 Free Software Foundation, Inc.
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
Author: Daniel Bšhringer <boehring@biomed.ruhr-uni-bochum.de>
Date: August 1998
Update: Richard Frith-Macdonald <richard@brainstorm.co.uk> March 1999

5
Headers/AppKit/NSPasteboard.h
View file

@ -175,11 +175,6 @@ APPKIT_EXPORT NSString *NSRulerPboard;
*/
APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
@class NSPasteboard;
// Protocol definitions...
@protocol NSPasteboardWriting
@end
@interface NSPasteboard : NSObject
{

8
Source/NSPasteboard.m
View file

@ -1241,7 +1241,7 @@ static NSMapTable *mimeMap = NULL;
NS_HANDLER
{
NSLog(@"%s:exception: %@", __PRETTY_FUNCTION__, localException);
#if 0
#if 0 // Testplant-MAL-10042016: keeping branch code due to GPBS instability
[NSException raise: NSPasteboardCommunicationException
format: @"%@", [localException reason]];
#endif
@ -1279,7 +1279,7 @@ static NSMapTable *mimeMap = NULL;
NS_HANDLER
{
NSLog(@"%s:exception: %@", __PRETTY_FUNCTION__, localException);
#if 0
#if 0 // Testplant-MAL-10042016: keeping branch code due to GPBS instability
[NSException raise: NSPasteboardCommunicationException
format: @"%@", [localException reason]];
#endif
@ -1940,9 +1940,6 @@ static NSMapTable *mimeMap = NULL;
+ (id) _lostServer: (NSNotification*)notification
{
id obj = the_server;
#if 0
NSLog(@"%s:notification: %@", __PRETTY_FUNCTION__, notification);
#endif
the_server = nil;
[[NSNotificationCenter defaultCenter]
@ -2088,6 +2085,7 @@ description, [cmd stringByDeletingLastPathComponent]);
object: nil];
#if defined(__MINGW32__)
// Testplant-MAL-10042016: keeping branch code
NSTask *task = AUTORELEASE([NSTask new]);
[task setStandardError:[NSFileHandle fileHandleForWritingAtPath:@"NUL"]];
[task setStandardOutput:[NSFileHandle fileHandleForWritingAtPath:@"NUL"]];