Author: fredkiefer
Date: Wed Mar 11 00:02:09 2015
New Revision: 38392
URL: http://svn.gna.org/viewcvs/gnustep?rev=38392&view=rev
Log:
* Source/NSCollectionViewItem.m: Fix reference counting in
-copyWithZone:. Remove method -view again.
* Source/NSArrayController.m: Fix reference counting in
-newItemForRepresentedObject. Protect -_resetItemSize from
missing prototype view.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSCollectionView.m
libs/gui/trunk/Source/NSCollectionViewItem.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38392&r1=38391&r2=38392&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Wed Mar 11 00:02:09 2015
@@ -1,3 +1,11 @@
+2015-03-10 Fred Kiefer <[email protected]>
+
+ * Source/NSCollectionViewItem.m: Fix reference counting in
+ -copyWithZone:. Remove method -view again.
+ * Source/NSArrayController.m: Fix reference counting in
+ -newItemForRepresentedObject. Protect -_resetItemSize from missing
+ prototype view.
+
2015-03-08 Fred Kiefer <[email protected]>
* Source/NSCollectionView.m (-tile): Prevent _numberOfColumns from
Modified: libs/gui/trunk/Source/NSCollectionView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSCollectionView.m?rev=38392&r1=38391&r2=38392&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSCollectionView.m (original)
+++ libs/gui/trunk/Source/NSCollectionView.m Wed Mar 11 00:02:09 2015
@@ -125,7 +125,7 @@
- (void) _resetItemSize
{
- if (itemPrototype)
+ if (itemPrototype && ([itemPrototype view] != nil))
{
_itemSize = [[itemPrototype view] frame].size;
_minItemSize = NSMakeSize (_itemSize.width, _itemSize.height);
@@ -240,6 +240,7 @@
}
else
{
+ [self _resetItemSize];
// Force recalculation of each item's frame
_itemSize = _minItemSize;
_tileWidth = -1.0;
@@ -482,7 +483,7 @@
NSCollectionViewItem *collectionItem = nil;
if (itemPrototype)
{
- ASSIGN(collectionItem, [itemPrototype copy]);
+ collectionItem = [itemPrototype copy];
[collectionItem setRepresentedObject: object];
}
return AUTORELEASE (collectionItem);
Modified: libs/gui/trunk/Source/NSCollectionViewItem.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSCollectionViewItem.m?rev=38392&r1=38391&r2=38392&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSCollectionViewItem.m (original)
+++ libs/gui/trunk/Source/NSCollectionViewItem.m Wed Mar 11 00:02:09 2015
@@ -101,13 +101,6 @@
ASSIGN(imageView, anImageView);
}
-- (NSView *) view
-{
- // FIXME
- [[self textField] setStringValue: [self representedObject]];
- return [self textField];
-}
-
- (id) initWithCoder: (NSCoder *)aCoder
{
self = [super initWithCoder: aCoder];
@@ -161,7 +154,7 @@
NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject: self];
NSCollectionViewItem *newItem =
[NSKeyedUnarchiver unarchiveObjectWithData: itemAsData];
- return newItem;
+ return RETAIN(newItem);
}
@end
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
