gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-07 19:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix header issues.

Browse source
This commit is contained in:
Gregory John Casamento 2020-01-21 22:58:17 -05:00
parent 2c5d75cb8f
commit 1dcda30d27
4 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Headers/Additions/GNUstepGUI/GSXib5KeyedUnarchiver.h
View file

@ -28,6 +28,9 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "GNUstepGUI/GSXibKeyedUnarchiver.h" #import "GNUstepGUI/GSXibKeyedUnarchiver.h"
#import "GNUstepGUI/GSNibLoading.h"
#import "GNUstepGUI/GSXibLoading.h"
#import "GNUstepGUI/GSXibElement.h"
@class GSXibElement; @class GSXibElement;
@ -45,3 +48,31 @@
- (NSRange) decodeRangeForKey: (NSString*)key; - (NSRange) decodeRangeForKey: (NSString*)key;
@end @end
@interface NSWindowTemplate5 : NSWindowTemplate
{
BOOL _visibleAtLaunch;
NSToolbar *_toolbar;
}
@end
@interface NSCustomObject5 : NSCustomObject
{
NSString *_userLabel;
}
- (NSString*) userLabel;
@end
@interface IBActionConnection5 : IBActionConnection
{
NSString *trigger;
}
@end
@interface IBOutletConnection5 : IBOutletConnection
@end
@interface IBUserDefinedRuntimeAttribute5 : IBUserDefinedRuntimeAttribute
@end

1
Source/GNUmakefile
View file

@ -584,6 +584,7 @@ GSWindowDecorationView.h \
GSXibElement.h \ GSXibElement.h \
GSXibLoading.h \ GSXibLoading.h \
GSXibKeyedUnarchiver.h \ GSXibKeyedUnarchiver.h \
GSXib5KeyedUnarchiver.h \
GSXibObjectContainer.h \ GSXibObjectContainer.h \
GSHelpAttachment.h GSHelpAttachment.h

35
Source/GSXib5KeyedUnarchiver.m
View file

@ -28,10 +28,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#import "GSXib5KeyedUnarchiver.h" #import "GNUstepGUI/GSXib5KeyedUnarchiver.h"
#import "GNUstepGUI/GSNibLoading.h"
#import "GNUstepGUI/GSXibLoading.h"
#import "GNUstepGUI/GSXibElement.h"
#import "AppKit/NSApplication.h" #import "AppKit/NSApplication.h"
#import "AppKit/NSBox.h" #import "AppKit/NSBox.h"
@ -63,14 +60,6 @@
#define DEBUG_XIB5 0 #define DEBUG_XIB5 0
@interface NSCustomObject5 : NSCustomObject
{
NSString *_userLabel;
}
- (NSString*) userLabel;
@end
@implementation NSCustomObject5 @implementation NSCustomObject5
static NSString *ApplicationClass = nil; static NSString *ApplicationClass = nil;
@ -111,12 +100,9 @@ static NSString *ApplicationClass = nil;
return _userLabel; return _userLabel;
} }
@end - (NSString *) description
@interface NSWindowTemplate5 : NSWindowTemplate
{ {
BOOL _visibleAtLaunch; return [[super description] stringByAppendingFormat: @"%@ - %@", _userLabel, _className];
NSToolbar *_toolbar;
} }
@end @end
@ -166,12 +152,6 @@ static NSString *ApplicationClass = nil;
@end @end
@interface IBActionConnection5 : IBActionConnection
{
NSString *trigger;
}
@end
@implementation IBActionConnection5 @implementation IBActionConnection5
- (instancetype) initWithCoder: (NSCoder *)coder - (instancetype) initWithCoder: (NSCoder *)coder
@ -250,9 +230,6 @@ static NSString *ApplicationClass = nil;
@end @end
@interface IBOutletConnection5 : IBOutletConnection
@end
@implementation IBOutletConnection5 @implementation IBOutletConnection5
- (instancetype) initWithCoder: (NSCoder *)coder - (instancetype) initWithCoder: (NSCoder *)coder
@ -279,10 +256,6 @@ static NSString *ApplicationClass = nil;
@end @end
@interface IBUserDefinedRuntimeAttribute5 : IBUserDefinedRuntimeAttribute
@end
@implementation IBUserDefinedRuntimeAttribute5 @implementation IBUserDefinedRuntimeAttribute5
- (id) initWithCoder: (NSCoder *)coder - (id) initWithCoder: (NSCoder *)coder
@ -640,7 +613,7 @@ static NSArray *XmlBoolDefaultYes = nil;
if (parentId == nil) if (parentId == nil)
{ {
NSLog(@"Missing parent Id for connection on parent @%", parent); NSLog(@"Missing parent Id for connection on parent %@", parent);
// Fake an id for parent // Fake an id for parent
parentId = [[NSUUID UUID] UUIDString]; parentId = [[NSUUID UUID] UUIDString];
[parent setAttribute: parentId forKey: @"id"]; [parent setAttribute: parentId forKey: @"id"];

2
Source/GSXibLoader.m
View file

@ -44,7 +44,7 @@
#import "GNUstepGUI/GSNibLoading.h" #import "GNUstepGUI/GSNibLoading.h"
#import "GNUstepGUI/GSXibLoading.h" #import "GNUstepGUI/GSXibLoading.h"
#import "GNUstepGUI/GSXibKeyedUnarchiver.h" #import "GNUstepGUI/GSXibKeyedUnarchiver.h"
#import "GSXib5KeyedUnarchiver.h" #import "GNUstepGUI/GSXib5KeyedUnarchiver.h"
@interface NSApplication (NibCompatibility) @interface NSApplication (NibCompatibility)
- (void) _setMainMenu: (NSMenu*)aMenu; - (void) _setMainMenu: (NSMenu*)aMenu;