NSUserInterfaceItemIdentification changes.

Headers/AppKit/NSUserInterfaceItemIdentification.h

@@ -1,44 +1,56 @@
-/** NSUserInterfaceItemIdentification.h
-   <abstract>Associate a unique identifier with objects in your user interface</abstract>
-
-   Copyright <copy>(C) 2017 Free Software Foundation, Inc.</copy>
-
-   Author: Daniel Ferreira <dtf@stanford.edu>
-   Date: 2017
-
-   This file is part of the GNUstep GUI Library.
+/* Definition of class NSUserInterfaceItemIdentification
+   Copyright (C) 2020 Free Software Foundation, Inc.
+   
+   By: Gregory John Casamento
+   Date: Tue Apr 14 13:46:36 EDT 2020
 
+   This file is part of the GNUstep Library.
+   
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
+   version 2.1 of the License, or (at your option) any later version.
+   
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
-   Lesser General Public License for more details.
-
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; see the file COPYING.LIB.
-   If not, see <http://www.gnu.org/licenses/> or write to the 
-   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
-   Boston, MA 02110-1301, USA.
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110 USA.
 */
 
-#ifndef _GNUstep_H_NSUserInterfaceItemIdentification
-#define _GNUstep_H_NSUserInterfaceItemIdentification
+#ifndef _NSUserInterfaceItemIdentification_h_GNUSTEP_GUI_INCLUDE
+#define _NSUserInterfaceItemIdentification_h_GNUSTEP_GUI_INCLUDE
 
-@class NSString;
+#import <Foundation/NSObject.h>
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
-@protocol NSUserInterfaceItemIdentification
-#if GS_HAS_DECLARED_PROPERTIES
-@property (copy) NSString *identifier;
-#else
-- (NSString *) identifier;
-- (void) setIdentifier: (NSString *)identifier;
-#endif
-@end
+
+#if	defined(__cplusplus)
+extern "C" {
 #endif
 
+typedef NSString *NSUserInterfaceItemIdentifier;
+  
+@protocol NSUserInterfaceItemIdentification
+
+#if GS_HAS_DECLARED_PROPERTIES
+@property (copy) NSUserInterfaceItemIdentifier identifier;
+#else
+- (NSUserInterfaceItemIdentifier) identifier;
+- (void) setIdentifier (NSUserInterfaceItemIdentifier)identifier;
 #endif
+
+@end
+
+#if	defined(__cplusplus)
+}
+#endif
+
+#endif	/* GS_API_MACOSX */
+
+#endif	/* _NSUserInterfaceItemIdentification_h_GNUSTEP_GUI_INCLUDE */
+

Headers/AppKit/NSWindowRestoration.h

@@ -26,13 +26,15 @@
 #define _NSWindowRestoration_h_GNUSTEP_GUI_INCLUDE
 
 #import <Foundation/NSObject.h>
+#import <Foundation/NSCoder.h>
+#import "AppKit/NSUserInterfaceItemIdentification.h"
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
 
 #if	defined(__cplusplus)
 extern "C" {
 #endif
-
+  
 DEFINE_BLOCK_TYPE(GSWindowRestorationHandler, void, NSWindow*, NSError*);
   
 @protocol NSWindowRestoration