* Source/NSTableView.m (-selectedColumnIndexes,

* -selectedRowIndexes): Return an
        autoreleased copy of the corresponding ivar. Returning a
reference to the ivar
        leads to issues (and behavior different from Cocoa) when
iterating thru the
        indexsets if at a time they would be being altered.
        Patch by Frank LeGrand (flegrand@testplant.com).
        * Source/GNUmakefile: Add NSCollectionViewItem.
        * Headers/AppKit/NSCollectionView.h,
        * Headers/AppKit/NSCollectionViewItem.h,
        * Source/NSCollectionViewItem.m,
        * Source/NSCollectionView.m: Bring closer to the GNUstep coding
        * standard.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36551 72102866-910b-0410-8b05-ffd578937521

Source/NSCollectionViewItem.m

@@ -25,99 +25,68 @@
    Boston, MA 02110-1301, USA.
 */
 
-#import "AppKit/NSCollectionViewItem.h"
-
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDebug.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSFormatter.h>
-#import <Foundation/NSIndexSet.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSNotification.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSSortDescriptor.h>
-#import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
+#import <Foundation/NSArray.h>
 #import <Foundation/NSKeyedArchiver.h>
 
-#import "AppKit/NSTableView.h"
-#import "AppKit/NSApplication.h"
-#import "AppKit/NSCell.h"
-#import "AppKit/NSClipView.h"
-#import "AppKit/NSColor.h"
-#import "AppKit/NSEvent.h"
-#import "AppKit/NSImage.h"
-#import "AppKit/NSGraphics.h"
-#import "AppKit/NSKeyValueBinding.h"
-#import "AppKit/NSScroller.h"
-#import "AppKit/NSScrollView.h"
-#import "AppKit/NSTableColumn.h"
-#import "AppKit/NSTableHeaderView.h"
-#import "AppKit/NSText.h"
-#import "AppKit/NSTextFieldCell.h"
-#import "AppKit/NSWindow.h"
-#import "AppKit/PSOperators.h"
-#import "AppKit/NSCachedImageRep.h"
-#import "AppKit/NSPasteboard.h"
-#import "AppKit/NSDragging.h"
-#import "AppKit/NSCustomImageRep.h"
-#import "AppKit/NSAttributedString.h"
-#import "AppKit/NSStringDrawing.h"
-#import "GNUstepGUI/GSTheme.h"
-#import "GSBindingHelpers.h"
-
-#include <math.h>
+#import "AppKit/NSCollectionView.h"
+#import "AppKit/NSCollectionViewItem.h"
+#import "AppKit/NSImageView.h"
+#import "AppKit/NSTextField.h"
 
 @implementation NSCollectionViewItem
 
-- (void)awakeFromNib
+- (void) awakeFromNib
 {
 }
 
-- (BOOL)isSelected
+- (BOOL) isSelected
 {
   return _isSelected;
 }
 
-- (void)dealloc
+- (void) dealloc
 {
-  DESTROY (textField);
-  DESTROY (imageView);
+  DESTROY(textField);
+  DESTROY(imageView);
   [super dealloc];
 }
 
-- (NSCollectionView *)collectionView
+- (NSCollectionView *) collectionView
 {
   return (NSCollectionView *)[[self view] superview];
 }
 
-- (void)setSelected:(BOOL)flag
+- (NSArray *) draggingImageComponents
+{
+  // FIXME: We don't have NSDraggingImageComponent
+  return [NSArray array];
+}
+
+- (void) setSelected: (BOOL)flag
 {
   if (_isSelected != flag)
     {
       _isSelected = flag;
-	}
+    }
 }
 
-- (id)representedObject
+- (id) representedObject
 {
   return [super representedObject];
 }
 
-- (void)setRepresentedObject:(id)anObject
+- (void) setRepresentedObject: (id)anObject
 {
   [super setRepresentedObject:anObject];
   //[textField setStringValue:[self representedObject]];
 }
 
-- (NSTextField *)textField
+- (NSTextField *) textField
 {
   return textField;
 }
 
-- (void)setTextField:(NSTextField *)aTextField
+- (void) setTextField: (NSTextField *)aTextField
 {
   if (textField != aTextField)
     {
@@ -125,12 +94,12 @@
     }
 }
 
-- (NSImageView *)imageView
+- (NSImageView *) imageView
 {
   return imageView;
 }
 
-- (void)setImageView:(NSImageView *)anImageView
+- (void) setImageView: (NSImageView *)anImageView
 {
   if (imageView != anImageView)
     {
@@ -138,15 +107,15 @@
     }
 }
 
-- (id)initWithCoder:(NSCoder *)aCoder
+- (id) initWithCoder: (NSCoder *)aCoder
 {
-  self = [super initWithCoder:aCoder];
+  self = [super initWithCoder: aCoder];
   if (nil != self)
     {
-      if(YES == [aCoder allowsKeyedCoding])
+      if (YES == [aCoder allowsKeyedCoding])
 	{
-	  textField = [aCoder decodeObjectForKey:@"textField"];
-	  imageView = [aCoder decodeObjectForKey:@"imageView"];
+	  textField = [aCoder decodeObjectForKey: @"textField"];
+	  imageView = [aCoder decodeObjectForKey: @"imageView"];
 	}
       else
 	{
@@ -159,24 +128,24 @@
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
-  [super encodeWithCoder:aCoder];
-  if(YES == [aCoder allowsKeyedCoding])
+  [super encodeWithCoder: aCoder];
+  if (YES == [aCoder allowsKeyedCoding])
     {
-      [aCoder encodeObject:textField forKey:@"textField"];
-      [aCoder encodeObject:imageView forKey:@"imageView"];
+      [aCoder encodeObject: textField forKey: @"textField"];
+      [aCoder encodeObject: imageView forKey: @"imageView"];
     }
   else
     {
-      [aCoder encodeObject:textField];
-      [aCoder encodeObject:imageView]
+      [aCoder encodeObject: textField];
+      [aCoder encodeObject: imageView];
     }
 }
 
-- (id) copyWithZone:(NSZone *)zone 
+- (id) copyWithZone: (NSZone *)zone 
 {
-  NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject:self];
+  NSData *itemAsData = [NSKeyedArchiver archivedDataWithRootObject: self];
   NSCollectionViewItem *newItem = 
-    [NSKeyedUnarchiver unarchiveObjectWithData:itemAsData];
+    [NSKeyedUnarchiver unarchiveObjectWithData: itemAsData];
   return newItem;
 }