Nib compatibility code merge.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@22957 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2006-05-20 22:12:46 +00:00
parent c91dddc12b
commit d5e4858a60
36 changed files with 3162 additions and 1236 deletions

View file

@ -2256,13 +2256,12 @@ static NSColor *shadowCol;
if ([aDecoder containsValueForKey: @"NSCellFlags"])
{
int cFlags;
unsigned long cFlags;
cFlags = [aDecoder decodeIntForKey: @"NSCellFlags"];
// This bit flag is the other way around!
[self setWraps: ((cFlags & 0x40) != 0x40)];
[self setContinuous: ((cFlags & 0x80000) == 0x80000)];
[self setScrollable: ((cFlags & 0x100000) == 0x100000)];
// Strange that this is not a simple bit flag
[self setSelectable: ((cFlags & 0x200001) == 0x200001)];
@ -2272,12 +2271,13 @@ static NSColor *shadowCol;
{
[self setType: NSTextCellType];
}
[self setContinuous: ((cFlags & 0x40000) == 0x40000)];
[self setEditable: ((cFlags & 0x10000000) == 0x10000000)];
// This bit flag is the other way around!
[self setEnabled: ((cFlags & 0x20000000) != 0x20000000)];
[self setHighlighted: ((cFlags & 0x40000000) == 0x40000000)];
// FIXME
[self setState: ((cFlags & 0x80000000) == 0x80000000)?NSOnState:NSOffState];
}
if ([aDecoder containsValueForKey: @"NSCellFlags2"])
{
@ -2306,7 +2306,6 @@ static NSColor *shadowCol;
[self setImportsGraphics: ((cFlags2 & 0x20000000) == 0x20000000)];
[self setAllowsEditingTextAttributes: ((cFlags2 & 0x40000000) == 0x40000000)];
// FIXME
}
if ([aDecoder containsValueForKey: @"NSSupport"])
{