Author: mlytwyn
Date: Wed Sep 14 16:02:59 2016
New Revision: 40081
URL: http://svn.gna.org/viewcvs/gnustep?rev=40081&view=rev
Log:
Merges with base trunk revision 40072
Modified:
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUndoManager.h
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserDefaults.h
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserNotification.h
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSXMLNodeOptions.h
Modified:
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUndoManager.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUndoManager.h?rev=40081&r1=40080&r2=40081&view=diff
==============================================================================
---
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUndoManager.h
(original)
+++
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUndoManager.h
Wed Sep 14 16:02:59 2016
@@ -145,6 +145,7 @@
@end
+// Testplant-MAL-09142016: This is added code for additional support
@interface NSCellUndoManager : NSUndoManager
// Special undo manager for the field editor so that it doesn't interfere with
the window's undo manager.
{
Modified:
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserDefaults.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserDefaults.h?rev=40081&r1=40080&r2=40081&view=diff
==============================================================================
---
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserDefaults.h
(original)
+++
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserDefaults.h
Wed Sep 14 16:02:59 2016
@@ -46,8 +46,15 @@
/* Standard domains */
/**
- * User defaults domain for process arguments. Command-line arguments
- * (attribute-value pairs, as in "-NSFoo bar") are placed into this domain.
+ * User defaults domain for process arguments. Command-line arguments
+ * (key-value pairs, as in "-NSFoo bar") are placed in this domain.<br />
+ * Where there is a sequence of arguments beginning with '-', only the
+ * last one is used (so "-a -b -c d" will produce a single user default
+ * 'c' with value 'd').<br />
+ * NB. On OSX the argument "-" means a key consisting of an empty string
+ * (so you can't use a '-' as a default value), while in GNUstep a "-" is
+ * a special case which does not mean a default key (so '-' may be used
+ * as a value).<br />
*/
GS_EXPORT NSString* const NSArgumentDomain;
Modified:
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserNotification.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserNotification.h?rev=40081&r1=40080&r2=40081&view=diff
==============================================================================
---
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserNotification.h
(original)
+++
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSUserNotification.h
Wed Sep 14 16:02:59 2016
@@ -61,6 +61,8 @@
#if GS_EXPOSE(NSUserNotification)
@public
id _uniqueId;
+ // Testplant-MAL-09142016: Addtions for supporting @synthesize which for
does not
+ // compile for our version of clang - why?
NSString *title;
NSString *subtitle;
NSString *informativeText;
Modified:
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSXMLNodeOptions.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSXMLNodeOptions.h?rev=40081&r1=40080&r2=40081&view=diff
==============================================================================
---
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSXMLNodeOptions.h
(original)
+++
libs/base/branches/gnustep_testplant_branch/Headers/Foundation/NSXMLNodeOptions.h
Wed Sep 14 16:02:59 2016
@@ -106,7 +106,7 @@
NSXMLNodePrettyPrint = 1 << 17,
NSXMLDocumentIncludeContentTypeDeclaration = 1 << 18,
-
+
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7,GS_API_LATEST)
NSXMLNodeLoadExternalEntitiesNever = 1 << 19,
#endif
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
