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

Added back in the old templates for backwards compatibility. These will disappear in the next major release.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17977 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-10-25 20:50:08 +00:00
parent fca20ea849
commit 98a44831b1
7 changed files with 957 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2003-10-25 16:52 Gregory John Casamento <greg_casamento@yahoo.com>
* Source/GSNibTemplates.m: initWithFrame is not supposed to be called
on subclasses of NSControl as the designated initializer according to
docs. Removed the call.
* Source/GSNibCompatibility.[hm]: Added in the old templates for
compatibility ONLY. This is so any of the older .gorms which use
these templates can be loaded and used normally.
* Source/NSOutlineView.m: Corrected a documentation issue.
2003-10-25 12:53 Matt Rice <ratmice@yahoo.com>
* Source/NSWorkspace.m (-_connectApplication:): Ignore the path to

106
Headers/Additions/GNUstepGUI/GSNibCompatibility.h Normal file
View file

@ -0,0 +1,106 @@
/*
GSNibCompatibility.h
Copyright (C) 1997, 1999 Free Software Foundation, Inc.
Author: Gregory John Casamento <greg_casamento@yahoo.com>
Date: 2002
This file is part of the GNUstep GUI Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef _GNUstep_H_GSNibCompatibility
#define _GNUstep_H_GSNibCompatibility
#include <Foundation/NSObject.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSMenu.h>
#include <AppKit/NSView.h>
#include <AppKit/NSText.h>
#include <AppKit/NSTextView.h>
#include <AppKit/NSControl.h>
#include <AppKit/NSButton.h>
/*
As these classes are deprecated, they should disappear from the gnustep
distribution in the next major release. They are for backwards compatibility
ONLY.
*/
// DO NOT USE.
// templates
@protocol __DeprecatedTemplate__
- (void) setClassName: (NSString *)className;
- (NSString *)className;
- (id) instantiateObject: (NSCoder *)coder;
@end
@interface NSWindowTemplate : NSWindow <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
BOOL _deferFlag;
}
@end
@interface NSViewTemplate : NSView <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSTextTemplate : NSText <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSTextViewTemplate : NSTextView <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSMenuTemplate : NSMenu <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSControlTemplate : NSControl <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
id _delegate;
id _dataSource;
BOOL _usesDataSource;
}
@end
@interface NSButtonTemplate : NSButton <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
NSButtonType _buttonType;
}
@end
#endif /* _GNUstep_H_GSNibCompatibility */

26
Headers/Additions/GNUstepGUI/GSNibTemplates.h
View file

@ -124,30 +124,4 @@
withClassName: (NSString *)className
withSuperClassName: (NSString *)superClassName;
@end
/*
These templates are from the old system, which had some issues. Currently I believe
that NSWindowTemplate was the only one seeing use, so it is the only one included.
if any more are needed they will be added back.
As these classes are deprecated, they should disappear from the gnustep distribution
in the next major release.
*/
// DO NOT USE.
@protocol __DeprecatedTemplate__
- (void) setClassName: (NSString *)className;
- (NSString *)className;
- (id) instantiateObject: (NSCoder *)coder;
@end
@interface NSWindowTemplate : NSWindow <__DeprecatedTemplate__>
{
NSString *_className;
NSString *_parentClassName;
BOOL _deferFlag;
}
@end
#endif /* _GNUstep_H_GSNibTemplates */

4
Source/GNUmakefile
View file

@ -175,6 +175,7 @@ GSLayoutManager.m \
GSTypesetter.m \
GSHorizontalTypesetter.m \
GSNibTemplates.m \
GSNibCompatibility.m
# Turn off NSMenuItem warning that NSMenuItem conforms to <NSObject>,
# but does not implement <NSObject>'s methods itself (it inherits
@ -336,7 +337,8 @@ GSLayoutManager.h \
GSLayoutManager_internal.h \
GSTypesetter.h \
GSHorizontalTypesetter.h \
GSToolbarView.h
GSToolbarView.h \
GSNibCompatibility.h
libgnustep-gui_HEADER_FILES = ${GUI_HEADERS}

835
Source/GSNibCompatibility.m Normal file
View file

@ -0,0 +1,835 @@
/** <title>GSNibCompatibility</title>
<abstract>
These are the old template classes which were used in older .gorm files.
All of these classes are deprecated and should not be used directly.
They will be removed from the GUI library in the next few versions as
they need to be phased out gradually.
<p/>
If you have any .gorm files which were created using custom classes, you
should load them into Gorm and save them so that they will use the new
system. Updating the .gorm files should be as easy as that. These
classes are included ONLY for backwards compatibility.
</abstract>
Copyright (C) 1997, 1999 Free Software Foundation, Inc.
Author: Gregory John Casamento
Date: Oct 2003
This file is part of the GNUstep GUI Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library;
If not, write to the Free Software Foundation,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <Foundation/NSClassDescription.h>
#include <Foundation/NSArchiver.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSCoder.h>
#include <Foundation/NSData.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSEnumerator.h>
#include <Foundation/NSException.h>
#include <Foundation/NSInvocation.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSKeyValueCoding.h>
#include "AppKit/AppKit.h"
#include <GNUstepBase/GSObjCRuntime.h>
#include <GNUstepGUI/GSNibCompatibility.h>
//////////////////////////////////////////////////////////////////////////////////////////
////////////////// DEPRECATED TEMPLATES ----- THESE SHOULD NOT BE USED //////////////////
//////////////////////////////////////////////////////////////////////////////////////////
/*
As these classes are deprecated, they should disappear from the gnustep distribution
in the next major release.
*/
@implementation NSWindowTemplate
+ (void) initialize
{
if (self == [NSWindowTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- init
{
[super init];
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
// defer flag...
_deferFlag = NO;
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
id obj = nil;
Class aClass = NSClassFromString(_className);
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: [self zone]]
initWithContentRect: [self frame]
styleMask: [self styleMask]
backing: [self backingType]
defer: _deferFlag];
// fill in actual object from template...
[obj setBackgroundColor: [self backgroundColor]];
[(NSWindow*)obj setContentView: [self contentView]];
[obj setFrameAutosaveName: [self frameAutosaveName]];
[obj setHidesOnDeactivate: [self hidesOnDeactivate]];
[obj setInitialFirstResponder: [self initialFirstResponder]];
[obj setAutodisplay: [self isAutodisplay]];
[obj setReleasedWhenClosed: [self isReleasedWhenClosed]];
[obj _setVisible: [self isVisible]];
[obj setTitle: [self title]];
[obj setFrame: [self frame] display: NO];
RELEASE(self);
RETAIN(obj);
return obj;
}
// setters and getters...
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
- (BOOL)deferFlag
{
return _deferFlag;
}
- (void)setDeferFlag: (BOOL)flag
{
_deferFlag = flag;
}
@end
// Template for any classes which derive from NSView
@implementation NSViewTemplate
+ (void) initialize
{
if (self == [NSViewTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- initWithFrame: (NSRect)frame
{
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
[super initWithFrame: frame];
return self;
}
- init
{
// Start initially with the highest level class...
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
NSRect theFrame = [self frame];
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()]
initWithFrame: theFrame];
// set the attributes for the view
[obj setBounds: [self bounds]];
RELEASE(self);
RETAIN(obj);
return obj;
}
// setters and getters
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
@end
// Template for any classes which derive from NSText
@implementation NSTextTemplate
+ (void) initialize
{
if (self == [NSTextTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- initWithFrame: (NSRect)frame
{
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
[super initWithFrame: frame];
return self;
}
- init
{
// Start initially with the highest level class...
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
NSRect theFrame = [self frame];
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()]
initWithFrame: theFrame];
// set the attributes for the view
[obj setBounds: [self bounds]];
// set the attributes for text
[obj setBackgroundColor: [self backgroundColor]];
[obj setDrawsBackground: [self drawsBackground]];
[obj setEditable: [self isEditable]];
[obj setSelectable: [self isSelectable]];
[obj setFieldEditor: [self isFieldEditor]];
[obj setRichText: [self isRichText]];
[obj setImportsGraphics: [self importsGraphics]];
[obj setDelegate: [self delegate]];
RELEASE(self);
RETAIN(obj);
return obj;
}
// accessor methods...
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
@end
// Template for any classes which derive from NSTextView
@implementation NSTextViewTemplate
+ (void) initialize
{
if (self == [NSTextViewTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- initWithFrame: (NSRect)frame
{
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
[super initWithFrame: frame];
return self;
}
- init
{
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
NSRect theFrame = [self frame];
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()]
initWithFrame: theFrame];
// set the attributes for the view
[obj setBounds: [self bounds]];
// set the attributes for text
[obj setBackgroundColor: [self backgroundColor]];
[obj setDrawsBackground: [self drawsBackground]];
[obj setEditable: [self isEditable]];
[obj setSelectable: [self isSelectable]];
[obj setFieldEditor: [self isFieldEditor]];
[obj setRichText: [self isRichText]];
[obj setImportsGraphics: [self importsGraphics]];
[obj setDelegate: [self delegate]];
// text view
[obj setRulerVisible: [self isRulerVisible]];
[obj setInsertionPointColor: [self insertionPointColor]];
RELEASE(self);
RETAIN(obj);
return obj;
}
// accessors
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
@end
// Template for any classes which derive from NSMenu.
@implementation NSMenuTemplate
+ (void) initialize
{
if (self == [NSMenuTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- init
{
[super init];
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()] init];
// copy attributes
[obj setAutoenablesItems: [self autoenablesItems]];
[obj setTitle: [self title]];
RELEASE(self);
RETAIN(obj);
return obj;
}
// accessors
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
RETAIN(_className);
}
- (NSString *)className
{
return _className;
}
@end
// Template for any classes which derive from NSControl
@implementation NSControlTemplate
+ (void) initialize
{
if (self == [NSControlTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- initWithFrame: (NSRect)frame
{
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
[super initWithFrame: frame];
return self;
}
- init
{
// Start initially with the highest level class...
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(id) at: &_delegate];
[aCoder decodeValueOfObjCType: @encode(id) at: &_dataSource];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(id) at: &_delegate];
[aCoder encodeValueOfObjCType: @encode(id) at: &_dataSource];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
NSRect theFrame = [self frame];
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()]
initWithFrame: theFrame];
// set the attributes for the view
[obj setBounds: [self bounds]];
// set the attributes for the control
[obj setDoubleValue: [self doubleValue]];
[obj setFloatValue: [self floatValue]];
[obj setIntValue: [self intValue]];
[obj setObjectValue: [self objectValue]];
[obj setStringValue: [self stringValue]];
[obj setTag: [self tag]];
[obj setFont: [self font]];
[obj setAlignment: [self alignment]];
[obj setEnabled: [self isEnabled]];
[obj setContinuous: [self isContinuous]];
// since only some controls have delegates, we need to test...
if([obj respondsToSelector: @selector(setDelegate:)])
[obj setDelegate: _delegate];
// since only some controls have data sources, we need to test...
if([obj respondsToSelector: @selector(setDataSource:)])
[obj setDataSource: _dataSource];
// since only some controls have data sources, we need to test...
if([obj respondsToSelector: @selector(setUsesDataSource:)])
[obj setUsesDataSource: _usesDataSource];
RELEASE(self);
RETAIN(obj);
return obj;
}
// accessors
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
@end
// Template for any classes which derive from NSButton
@implementation NSButtonTemplate
+ (void) initialize
{
if (self == [NSButtonTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- initWithFrame: (NSRect)frame
{
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
_buttonType = NSMomentaryLightButton;
[super initWithFrame: frame];
return self;
}
- init
{
// Start initially with the highest level class...
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
_buttonType = NSMomentaryLightButton;
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(int) at: &_buttonType];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(int) at: &_buttonType];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
Class aClass = NSClassFromString(_className);
NSRect theFrame = [self frame];
id obj = nil;
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: NSDefaultMallocZone()]
initWithFrame: theFrame];
// set the attributes for the view
[obj setBounds: [self bounds]];
// set the attributes for the control
[obj setDoubleValue: [self doubleValue]];
[obj setFloatValue: [self floatValue]];
[obj setIntValue: [self intValue]];
[obj setObjectValue: [self objectValue]];
[obj setStringValue: [self stringValue]];
[obj setTag: [self tag]];
[obj setFont: [self font]];
[obj setAlignment: [self alignment]];
[obj setEnabled: [self isEnabled]];
[obj setContinuous: [self isContinuous]];
// button
[obj setButtonType: _buttonType];
[obj setBezelStyle: [self bezelStyle]];
[obj setBordered: [self isBordered]];
[obj setAllowsMixedState: [self allowsMixedState]];
[obj setTitle: [self title]];
[obj setAlternateTitle: [self alternateTitle]];
[obj setImage: [self image]];
[obj setAlternateImage: [self alternateImage]];
[obj setImagePosition: [self imagePosition]];
[obj setKeyEquivalent: [self keyEquivalent]];
RELEASE(self);
RETAIN(obj);
return obj;
}
// accessors
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
@end

128
Source/GSNibTemplates.m
View file

@ -683,6 +683,7 @@ static const int currentVersion = 1; // GSNibItem version number...
id obj = [super initWithCoder: coder];
if(obj != nil)
{
/*
if(![self respondsToSelector: @selector(isInInterfaceBuilder)])
{
if(GSGetInstanceMethodNotInherited([obj class],@selector(initWithFrame:)) != NULL)
@ -691,6 +692,7 @@ static const int currentVersion = 1; // GSNibItem version number...
obj = [obj initWithFrame: theFrame];
}
}
*/
RELEASE(self);
}
return obj;
@ -795,129 +797,3 @@ static const int currentVersion = 1; // GSNibItem version number...
return template;
}
@end
//////////////////////////////////////////////////////////////////////////////////////////
////////////////// DEPRECATED TEMPLATES ----- THESE SHOULD NOT BE USED //////////////////
//////////////////////////////////////////////////////////////////////////////////////////
/*
These templates are from the old system, which had some issues. Currently I believe
that NSWindowTemplate was the only one seeing use, so it is the only one included.
if any more are needed they will be added back.
As these classes are deprecated, they should disappear from the gnustep distribution
in the next major release.
*/
@implementation NSWindowTemplate
+ (void) initialize
{
if (self == [NSWindowTemplate class])
{
[self setVersion: 0];
}
}
- (void) dealloc
{
RELEASE(_parentClassName);
RELEASE(_className);
[super dealloc];
}
- init
{
[super init];
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
ASSIGN(_parentClassName, NSStringFromClass([super class]));
// defer flag...
_deferFlag = NO;
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
[super encodeWithCoder: aCoder];
}
- (id) awakeAfterUsingCoder: (NSCoder *)coder
{
if([self respondsToSelector: @selector(isInInterfaceBuilder)])
{
// if we live in the interface builder, give them an instance of
// the parent, not the child..
[self setClassName: _parentClassName];
}
return [self instantiateObject: coder];
}
- (id) instantiateObject: (NSCoder *)coder
{
id obj = nil;
Class aClass = NSClassFromString(_className);
if (aClass == nil)
{
[NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className];
}
obj = [[aClass allocWithZone: [self zone]]
initWithContentRect: [self frame]
styleMask: [self styleMask]
backing: [self backingType]
defer: _deferFlag];
// fill in actual object from template...
[obj setBackgroundColor: [self backgroundColor]];
[(NSWindow*)obj setContentView: [self contentView]];
[obj setFrameAutosaveName: [self frameAutosaveName]];
[obj setHidesOnDeactivate: [self hidesOnDeactivate]];
[obj setInitialFirstResponder: [self initialFirstResponder]];
[obj setAutodisplay: [self isAutodisplay]];
[obj setReleasedWhenClosed: [self isReleasedWhenClosed]];
[obj _setVisible: [self isVisible]];
[obj setTitle: [self title]];
[obj setFrame: [self frame] display: NO];
RELEASE(self);
return obj;
}
// setters and getters...
- (void) setClassName: (NSString *)name
{
ASSIGN(_className, name);
}
- (NSString *)className
{
return _className;
}
- (BOOL)deferFlag
{
return _deferFlag;
}
- (void)setDeferFlag: (BOOL)flag
{
_deferFlag = flag;
}
@end

2
Source/NSOutlineView.m
View file

@ -873,7 +873,7 @@ static NSImage *unexpandable = nil;
}
/**
* Sets the delegate of the outline view.
* Sets the delegate of the outlineView.
*/
- (void) setDelegate: (id)anObject
{