From 7e8ce092b15122dcc24117298205278a8630c819 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Mon, 31 Oct 2011 16:58:27 +0000 Subject: [PATCH] Clean up last change. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34096 72102866-910b-0410-8b05-ffd578937521 --- Source/NSTableColumn.m | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Source/NSTableColumn.m b/Source/NSTableColumn.m index 984135d3a..65ec9a19f 100644 --- a/Source/NSTableColumn.m +++ b/Source/NSTableColumn.m @@ -567,19 +567,7 @@ to YES. */ if (!self) return nil; - if (version == 3) - { - _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]); - _sortDescriptorPrototype = RETAIN([aDecoder decodeObject]); - } - else if (version == 2) + if (version >= 2) { _identifier = RETAIN([aDecoder decodeObject]); [aDecoder decodeValueOfObjCType: @encode(float) at: &_width]; @@ -589,6 +577,11 @@ to YES. */ [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable]; _headerCell = RETAIN([aDecoder decodeObject]); _dataCell = RETAIN([aDecoder decodeObject]); + + if (version >= 3) + { + _sortDescriptorPrototype = RETAIN([aDecoder decodeObject]); + } } else {