gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 03:50:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better check for click on table column border.

Browse source 
Allow table column identifier to be nil.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26482 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-05-01 19:48:28 +00:00
parent ddc130cae7
commit 0cba457027
4 changed files with 78 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Source/NSTableColumn.m
View file

@ -99,6 +99,9 @@
- (id)initWithIdentifier: (id)anObject
{
self = [super init];
if (!self)
return nil;
_width = 100;
_min_width = 10;
_max_width = 100000;
@ -406,30 +409,33 @@
id identifier = [aDecoder decodeObjectForKey: @"NSIdentifier"];
self = [self initWithIdentifier: identifier];
if (!self)
return nil;
if ([aDecoder containsValueForKey: @"NSDataCell"])
{
[self setDataCell: [aDecoder decodeObjectForKey: @"NSDataCell"]];
}
[self setDataCell: [aDecoder decodeObjectForKey: @"NSDataCell"]];
}
if ([aDecoder containsValueForKey: @"NSHeaderCell"])
{
[self setHeaderCell: [aDecoder decodeObjectForKey: @"NSHeaderCell"]];
}
[self setHeaderCell: [aDecoder decodeObjectForKey: @"NSHeaderCell"]];
}
if ([aDecoder containsValueForKey: @"NSIsResizeable"])
{
[self setResizable: [aDecoder decodeBoolForKey: @"NSIsResizeable"]];
}
[self setResizable: [aDecoder decodeBoolForKey: @"NSIsResizeable"]];
}
if ([aDecoder containsValueForKey: @"NSWidth"])
{
[self setWidth: [aDecoder decodeFloatForKey: @"NSWidth"]];
}
[self setWidth: [aDecoder decodeFloatForKey: @"NSWidth"]];
}
if ([aDecoder containsValueForKey: @"NSMinWidth"])
{
[self setMinWidth: [aDecoder decodeFloatForKey: @"NSMinWidth"]];
}
[self setMinWidth: [aDecoder decodeFloatForKey: @"NSMinWidth"]];
}
if ([aDecoder containsValueForKey: @"NSMaxWidth"])
{
[self setMaxWidth: [aDecoder decodeFloatForKey: @"NSMaxWidth"]];
}
[self setMaxWidth: [aDecoder decodeFloatForKey: @"NSMaxWidth"]];
}
}
else
{
@ -437,28 +443,31 @@
@"NSTableColumn"];
self = [super init];
if (version == 2)
if (!self)
return nil;
if (version == 2)
{
_identifier = RETAIN([aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(float) at: &_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_min_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_max_width];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_resizable];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
_headerCell = RETAIN([aDecoder decodeObject]);
_dataCell = RETAIN([aDecoder decodeObject]);
}
_identifier = RETAIN([aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(float) at: &_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_min_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_max_width];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_resizable];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
_headerCell = RETAIN([aDecoder decodeObject]);
_dataCell = RETAIN([aDecoder decodeObject]);
}
else
{
_identifier = RETAIN([aDecoder decodeObject]);
_headerCell = RETAIN([aDecoder decodeObject]);
_dataCell = RETAIN([aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(float) at: &_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_min_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_max_width];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_resizable];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
}
_identifier = RETAIN([aDecoder decodeObject]);
_headerCell = RETAIN([aDecoder decodeObject]);
_dataCell = RETAIN([aDecoder decodeObject]);
[aDecoder decodeValueOfObjCType: @encode(float) at: &_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_min_width];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_max_width];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_resizable];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
}
}
return self;
}