* Headers/AppKit/NSDataLinkManager.h, Source/NSDataLinkManager.m:

Re-add the changes from 2005-03-05.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@21029 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-04-01 15:39:05 +00:00
parent d2bb38a102
commit 39bc6b4f68
4 changed files with 37 additions and 29 deletions

View file

@ -1,3 +1,8 @@
2005-04-01 Adam Fedor <fedor@gnu.org>
* Headers/AppKit/NSDataLinkManager.h, Source/NSDataLinkManager.m:
Re-add the changes from 2005-03-05.
2005-04-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSDragView.m: when dragging, use the mouse offset to adjust

View file

@ -36,8 +36,7 @@ component like the GNUstep 'Back' Backend.
@ifset GNUSTEP-GUI-FTP-MACHINE
The gstep-gui-@value{GNUSTEP-GUI-VERSION}.tar.gz distribution
file has been placed on @samp{@value{GNUSTEP-GUI-FTP-MACHINE}} in
@samp{@value{GNUSTEP-GUI-FTP-DIRECTORY}}.
file has been placed at @url{ftp://@value{GNUSTEP-GUI-FTP-MACHINE}/@value{GNUSTEP-GUI-FTP-DIRECTORY}}.
@end ifset
Read the INSTALL file or the GNUstep-HOWTO for installation instructions.

View file

@ -44,12 +44,16 @@
// Attributes
id delegate;
NSString *filename;
BOOL delegateVerifiesLinks;
BOOL interactsWithUser;
BOOL isEdited;
BOOL areLinkOutlinesVisible;
NSMutableArray *sourceLinks;
NSMutableArray *destinationLinks;
struct __dlmFlags {
unsigned areLinkOutlinesVisible:1;
unsigned delegateVerifiesLinks:1;
unsigned interactsWithUser:1;
unsigned isEdited:1;
} _flags;
}
//

View file

@ -108,10 +108,10 @@
{
ASSIGN(delegate,anObject);
filename = nil;
delegateVerifiesLinks = NO;
interactsWithUser = NO;
isEdited = NO;
areLinkOutlinesVisible = NO;
_flags.delegateVerifiesLinks = NO;
_flags.interactsWithUser = NO;
_flags.isEdited = NO;
_flags.areLinkOutlinesVisible = NO;
}
return self;
@ -126,10 +126,10 @@
{
ASSIGN(delegate,anObject);
ASSIGN(filename,path);
delegateVerifiesLinks = NO;
interactsWithUser = NO;
isEdited = NO;
areLinkOutlinesVisible = NO;
_flags.delegateVerifiesLinks = NO;
_flags.interactsWithUser = NO;
_flags.isEdited = NO;
_flags.areLinkOutlinesVisible = NO;
}
return self;
@ -229,7 +229,7 @@
- (BOOL)delegateVerifiesLinks
{
return delegateVerifiesLinks;
return _flags.delegateVerifiesLinks;
}
- (NSString *)filename
@ -239,22 +239,22 @@
- (BOOL)interactsWithUser
{
return interactsWithUser;
return _flags.interactsWithUser;
}
- (BOOL)isEdited
{
return isEdited;
return _flags.isEdited;
}
- (void)setDelegateVerifiesLinks:(BOOL)flag
{
delegateVerifiesLinks = flag;
_flags.delegateVerifiesLinks = flag;
}
- (void)setInteractsWithUser:(BOOL)flag
{
interactsWithUser = flag;
_flags.interactsWithUser = flag;
}
//
@ -262,7 +262,7 @@
//
- (BOOL)areLinkOutlinesVisible
{
return areLinkOutlinesVisible;
return _flags.areLinkOutlinesVisible;
}
- (NSEnumerator *)destinationLinkEnumerator
@ -288,7 +288,7 @@
- (void)setLinkOutlinesVisible:(BOOL)flag
{
areLinkOutlinesVisible = flag;
_flags.areLinkOutlinesVisible = flag;
}
- (NSEnumerator *)sourceLinkEnumerator
@ -307,13 +307,13 @@
[aCoder encodeValueOfObjCType: @encode(id) at: &sourceLinks];
[aCoder encodeValueOfObjCType: @encode(id) at: &destinationLinks];
flag = areLinkOutlinesVisible;
flag = _flags.areLinkOutlinesVisible;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
flag = delegateVerifiesLinks;
flag = _flags.delegateVerifiesLinks;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
flag = interactsWithUser;
flag = _flags.interactsWithUser;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
flag = isEdited;
flag = _flags.isEdited;
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &flag];
}
@ -330,13 +330,13 @@
[aCoder decodeValueOfObjCType: @encode(id) at: &destinationLinks];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
areLinkOutlinesVisible = flag;
_flags.areLinkOutlinesVisible = flag;
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
delegateVerifiesLinks = flag;
_flags.delegateVerifiesLinks = flag;
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
interactsWithUser = flag;
_flags.interactsWithUser = flag;
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &flag];
isEdited = flag;
_flags.isEdited = flag;
}
else
{