mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
Added warning in GSNibCompatibility for ancient gorm files, refomatted some code in NSDataLinkPanel and added drag service init code to initWithCoder in NSTextView.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19620 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento
parent
9196d38d9c
commit
822370a34a
4 changed files with 65 additions and 53 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2004-06-25 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Source/GSNibCompatibility.m: Print a message when .gorm files are
|
||||
loaded which use the old templates contained here. The next major
|
||||
release should see the removal of these templates from GNUstep. The
|
||||
new templates have completely superceded these.
|
||||
* Source/NSTextView.m: Added call to register for types in
|
||||
initWithCoder:
|
||||
* Source/NSDataLinkPanel.m: Minor reformatting.
|
||||
|
||||
2004-06-26 Serg Stoyan <stoyan255@ukr.net>
|
||||
|
||||
* Source/NSBrowser.m:
|
||||
|
|
@ -39,6 +49,7 @@
|
|||
little more parallel to base Documentation makefile.
|
||||
* Documentation/GNUmakefile.postamble: Remove stray backslash.
|
||||
|
||||
>>>>>>> 1.2290
|
||||
2004-06-21 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSTableView.m:
|
||||
|
|
@ -61,6 +72,7 @@
|
|||
* Source/GSDragView.m: (-_handleEventDuringDragging:) Get mouse
|
||||
location on periodic event.
|
||||
|
||||
>>>>>>> 1.2286
|
||||
2004-06-19 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/Additions/GNUstepGUI/GSDisplayServer.h: Added new method
|
||||
|
|
@ -72,6 +84,7 @@
|
|||
(-_windowAcceptingDnDunder:windowRef:) with new GSDisplayServer
|
||||
method.
|
||||
|
||||
>>>>>>> 1.2283
|
||||
2004-06-17 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSComboBoxCell.m: buttonCellFrameFromRect(),
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@
|
|||
in the next major release.
|
||||
*/
|
||||
|
||||
#define DEPRECATION_WARNING NSLog(@"WARNING: Attempt to encode/decode an deprecated template. Please update the .gorm. Load the gorm file in Gorm.app and resave to update it.")
|
||||
|
||||
@implementation NSWindowTemplate
|
||||
+ (void) initialize
|
||||
{
|
||||
|
|
@ -86,11 +88,11 @@
|
|||
{
|
||||
[super init];
|
||||
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
|
||||
// defer flag...
|
||||
// defer flag
|
||||
_deferFlag = NO;
|
||||
|
||||
return self;
|
||||
|
|
@ -143,6 +145,7 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
|
||||
|
|
@ -152,10 +155,7 @@
|
|||
|
||||
- (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];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
backing: [self backingType]
|
||||
defer: _deferFlag];
|
||||
|
||||
// fill in actual object from template...
|
||||
// fill in actual object from template
|
||||
[obj setBackgroundColor: [self backgroundColor]];
|
||||
[(NSWindow*)obj setContentView: [self contentView]];
|
||||
[obj setFrameAutosaveName: [self frameAutosaveName]];
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
return obj;
|
||||
}
|
||||
|
||||
// setters and getters...
|
||||
// setters and getters
|
||||
- (void) setClassName: (NSString *)name
|
||||
{
|
||||
ASSIGN(_className, name);
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
|
||||
- initWithFrame: (NSRect)frame
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
[super initWithFrame: frame];
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
|
||||
- init
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
[super init];
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
|
|
@ -265,6 +265,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
return [super initWithCoder: aCoder];
|
||||
|
|
@ -272,9 +273,7 @@
|
|||
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[super encodeWithCoder: aCoder];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -344,7 +343,7 @@
|
|||
|
||||
- initWithFrame: (NSRect)frame
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
[super initWithFrame: frame];
|
||||
|
|
@ -353,7 +352,7 @@
|
|||
|
||||
- init
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
[super init];
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
|
|
@ -362,6 +361,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
return [super initWithCoder: aCoder];
|
||||
|
|
@ -369,9 +369,7 @@
|
|||
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[super encodeWithCoder: aCoder];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -419,7 +417,7 @@
|
|||
return obj;
|
||||
}
|
||||
|
||||
// accessor methods...
|
||||
// accessor methods
|
||||
- (void) setClassName: (NSString *)name
|
||||
{
|
||||
ASSIGN(_className, name);
|
||||
|
|
@ -450,7 +448,7 @@
|
|||
|
||||
- initWithFrame: (NSRect)frame
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
[super initWithFrame: frame];
|
||||
|
|
@ -467,6 +465,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
return [super initWithCoder: aCoder];
|
||||
|
|
@ -474,9 +473,7 @@
|
|||
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[super encodeWithCoder: aCoder];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -560,7 +557,7 @@
|
|||
- init
|
||||
{
|
||||
[super init];
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
return self;
|
||||
|
|
@ -568,6 +565,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
return [super initWithCoder: aCoder];
|
||||
|
|
@ -575,9 +573,7 @@
|
|||
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[super encodeWithCoder: aCoder];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -648,7 +644,7 @@
|
|||
|
||||
- initWithFrame: (NSRect)frame
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
[super initWithFrame: frame];
|
||||
|
|
@ -658,7 +654,7 @@
|
|||
|
||||
- init
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
[super init];
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
|
|
@ -667,6 +663,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_delegate];
|
||||
|
|
@ -677,12 +674,7 @@
|
|||
|
||||
- (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];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
@ -726,15 +718,15 @@
|
|||
[obj setEnabled: [self isEnabled]];
|
||||
[obj setContinuous: [self isContinuous]];
|
||||
|
||||
// since only some controls have delegates, we need to test...
|
||||
// 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...
|
||||
// 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...
|
||||
// since only some controls have data sources, we need to test
|
||||
if([obj respondsToSelector: @selector(setUsesDataSource:)])
|
||||
[obj setUsesDataSource: _usesDataSource];
|
||||
|
||||
|
|
@ -775,7 +767,7 @@
|
|||
|
||||
- initWithFrame: (NSRect)frame
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
_buttonType = NSMomentaryLightButton;
|
||||
|
|
@ -786,7 +778,7 @@
|
|||
|
||||
- init
|
||||
{
|
||||
// Start initially with the highest level class...
|
||||
// Start initially with the highest level class
|
||||
[super init];
|
||||
ASSIGN(_className, NSStringFromClass([super class]));
|
||||
ASSIGN(_parentClassName, NSStringFromClass([super class]));
|
||||
|
|
@ -796,6 +788,7 @@
|
|||
|
||||
- (id) initWithCoder: (NSCoder *)aCoder
|
||||
{
|
||||
DEPRECATION_WARNING;
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
|
||||
[aCoder decodeValueOfObjCType: @encode(int) at: &_buttonType];
|
||||
|
|
@ -804,10 +797,7 @@
|
|||
|
||||
- (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];
|
||||
DEPRECATION_WARNING;
|
||||
}
|
||||
|
||||
- (id) awakeAfterUsingCoder: (NSCoder *)coder
|
||||
|
|
|
|||
|
|
@ -114,13 +114,15 @@ static NSDataLinkPanel *__sharedDataLinkPanel;
|
|||
//
|
||||
+ (void)getLink:(NSDataLink **)link
|
||||
manager:(NSDataLinkManager **)linkManager
|
||||
isMultiple:(BOOL *)flag
|
||||
{}
|
||||
isMultiple:(BOOL *)flag
|
||||
{
|
||||
}
|
||||
|
||||
+ (void)setLink:(NSDataLink *)link
|
||||
manager:(NSDataLinkManager *)linkManager
|
||||
isMultiple:(BOOL)flag
|
||||
{}
|
||||
isMultiple:(BOOL)flag
|
||||
{
|
||||
}
|
||||
|
||||
//
|
||||
// Instance methods
|
||||
|
|
@ -131,13 +133,15 @@ isMultiple:(BOOL)flag
|
|||
//
|
||||
- (void)getLink:(NSDataLink **)link
|
||||
manager:(NSDataLinkManager **)linkManager
|
||||
isMultiple:(BOOL *)flag
|
||||
{}
|
||||
isMultiple:(BOOL *)flag
|
||||
{
|
||||
}
|
||||
|
||||
- (void)setLink:(NSDataLink *)link
|
||||
manager:(NSDataLinkManager *)linkManager
|
||||
isMultiple:(BOOL)flag
|
||||
{}
|
||||
isMultiple:(BOOL)flag
|
||||
{
|
||||
}
|
||||
|
||||
//
|
||||
// Customizing the Panel
|
||||
|
|
@ -148,7 +152,8 @@ isMultiple:(BOOL)flag
|
|||
}
|
||||
|
||||
- (void)setAccessoryView:(NSView *)aView
|
||||
{}
|
||||
{
|
||||
}
|
||||
|
||||
//
|
||||
// Responding to User Input
|
||||
|
|
|
|||
|
|
@ -747,6 +747,10 @@ that makes decoding and encoding compatible with the old code.
|
|||
[self _recacheDelegateResponses];
|
||||
[self invalidateTextContainerOrigin];
|
||||
|
||||
// register for services...
|
||||
if (!did_register_for_services)
|
||||
[isa registerForServices];
|
||||
|
||||
[self setPostsFrameChangedNotifications: YES];
|
||||
[notificationCenter addObserver: self
|
||||
selector: @selector(_updateState:)
|
||||
|
|
|
|||
Loading…
Reference in a new issue