From ad80fdd7171f1d2c04af994b51c9166b040a2899 Mon Sep 17 00:00:00 2001 From: ericwa Date: Fri, 9 Mar 2012 23:18:18 +0000 Subject: [PATCH] * Source/NSTableView.m: * Source/GSNibLoading.m: Move -[coder setClassName: @"_NSCornerView" forClass: [GSTableCornerView class]] call from -[NSTableView initWithCoder:] to GSNibLoading, because corner views can be encountered before hitting -[NSTableView initWithCoder:] git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34919 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 12 ++++++++++++ Source/GSNibLoading.m | 3 +++ Source/NSTableView.m | 2 -- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4108673ba..b77134658 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-03-09 Eric Wasylishen + + * Source/NSTableView.m: + * Source/GSNibLoading.m: Move -[coder setClassName: @"_NSCornerView" + forClass: [GSTableCornerView class]] call from + -[NSTableView initWithCoder:] to GSNibLoading, because corner views + can be encountered before hitting -[NSTableView initWithCoder:] + +2012-03-09 Eric Wasylishen + + * Source/NSClipView.m: Re-enable copy-on-scroll + 2012-03-09 Eric Wasylishen * Source/NSWindow.m: Only invoke -prepareForDragOperation: if the diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m index 21cdff475..2ec36b66f 100644 --- a/Source/GSNibLoading.m +++ b/Source/GSNibLoading.m @@ -1738,6 +1738,9 @@ static BOOL _isInInterfaceBuilder = NO; NSArray *accessibilityOidsKeys = nil; NSArray *accessibilityOidsValues = nil; + [(NSKeyedUnarchiver *)coder setClass: NSClassFromString(@"GSTableCornerView") + forClassName: @"_NSCornerView"]; + // // Get root, font, framwork and oid. // Retain objects since NSKeyedUnarchiver autoreleases unarchived objects. diff --git a/Source/NSTableView.m b/Source/NSTableView.m index 2cfd72b5a..8895e5fab 100644 --- a/Source/NSTableView.m +++ b/Source/NSTableView.m @@ -5573,8 +5573,6 @@ This method is deprecated, use -columnIndexesInRect:. */ [self setRowHeight: [aDecoder decodeFloatForKey: @"NSRowHeight"]]; } - [(NSKeyedUnarchiver *)aDecoder setClass: [GSTableCornerView class] - forClassName: @"_NSCornerView"]; if ([aDecoder containsValueForKey: @"NSCornerView"]) { NSView *aView = [aDecoder decodeObjectForKey: @"NSCornerView"];