Fix #14, add .framework target, fix warnings

Classes/AppDelegate.m

@@ -14,7 +14,7 @@
 #pragma mark Constants
 
 #define LISTVIEW_CELL_IDENTIFIER		@"MyListViewCell"
-#define NUM_EXAMPLE_ITEMS				10
+#define NUM_EXAMPLE_ITEMS				1000
 
 
 @implementation AppDelegate
@@ -74,18 +74,23 @@ - (PXListViewCell*)listView:(PXListView*)aListView cellForRow:(NSUInteger)row
 
 - (CGFloat)listView:(PXListView*)aListView heightOfRow:(NSUInteger)row
 {
+#pragma unused(aListView)
+#pragma unused(row)
 	return 50;
 }
 
 - (void)listViewSelectionDidChange:(NSNotification*)aNotification
 {
+#pragma unused(aNotification)
     NSLog(@"Selection changed");
 }
 
 
 // The following are only needed for drag'n drop:
 - (BOOL)listView:(PXListView*)aListView writeRowsWithIndexes:(NSIndexSet*)rowIndexes toPasteboard:(NSPasteboard*)dragPasteboard
 {
+#pragma unused(aListView)
+#pragma unused(rowIndexes)
 	// +++ Actually drag the items, not just dummy data.
 	[dragPasteboard declareTypes: [NSArray arrayWithObjects: NSStringPboardType, nil] owner: self];
 	[dragPasteboard setString: @"Just Testing" forType: NSStringPboardType];
@@ -96,11 +101,16 @@ - (BOOL)listView:(PXListView*)aListView writeRowsWithIndexes:(NSIndexSet*)rowInd
 - (NSDragOperation)listView:(PXListView*)aListView validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSUInteger)row
 							proposedDropHighlight:(PXListViewDropHighlight)dropHighlight;
 {
+#pragma unused(aListView)
+#pragma unused(dropHighlight)
+#pragma unused(info)
+#pragma unused(row)
 	return NSDragOperationCopy;
 }
 
 - (IBAction) reloadTable:(id)sender
 {
+#pragma unused(sender)
 	[listView reloadData];
 }
 

Classes/MyListViewCell.m

@@ -47,6 +47,7 @@ - (void)prepareForReuse
 
 - (void)drawRect:(NSRect)dirtyRect
 {
+#pragma unused(dirtyRect)
 	if([self isSelected]) {
 		[[NSColor selectedControlColor] set];
 	}

Classes/PXListDocumentView.h

@@ -19,7 +19,7 @@
 }
 
 @property (assign) PXListView				*listView;
-@property (assign) PXListViewDropHighlight	dropHighlight;
+@property (assign,nonatomic) PXListViewDropHighlight	dropHighlight;
 
 -(void)	setDropHighlight: (PXListViewDropHighlight)inState;
 

Classes/PXListView+Private.h

@@ -6,6 +6,13 @@
 //  Copyright 2010 Alex Rozanski. http://perspx.com. All rights reserved.
 //
 
+// Apple sadly doesn't provide CGFloat variants of these:
+#if CGFLOAT_IS_DOUBLE
+#define CGFLOATABS(n)	fabs(n)
+#else
+#define CGFLOATABS(n)	fabsf(n)
+#endif
+
 // This is a renamed copy of UKIsDragStart from <http://github.com/uliwitness/UliKit>:
 // Possible return values from UKIsDragStart:
 enum
@@ -40,4 +47,6 @@ typedef NSInteger PXIsDragStartResult;
 - (void)contentViewBoundsDidChange:(NSNotification*)notification;
 -(void)layoutCellsForResizeEvent;
 
+- (void)windowSizing:(NSNotification *)inNot;
+
 @end

Classes/PXListView+UserInteraction.m

@@ -11,13 +11,6 @@
 #import "PXListView+UserInteraction.h"
 #import "PXListView+Private.h"
 
-// Apple sadly doesn't provide CGFloat variants of these:
-#if CGFLOAT_IS_DOUBLE
-#define CGFLOATABS(n)	fabs(n)
-#else
-#define CGFLOATABS(n)	fabsf(n)
-#endif
-
 // This is a renamed copy of UKIsDragStart from <http://github.com/uliwitness/UliKit>:
 static PXIsDragStartResult PXIsDragStart( NSEvent *startEvent, NSTimeInterval theTimeout )
 {
@@ -31,7 +24,7 @@ static PXIsDragStartResult PXIsDragStart( NSEvent *startEvent, NSTimeInterval th
 	NSAutoreleasePool	*pool = nil;
 	while( ([expireTime timeIntervalSinceReferenceDate] -[NSDate timeIntervalSinceReferenceDate]) > 0 )
 	{
-		[pool release];
+		[pool drain];
 		pool = [[NSAutoreleasePool alloc] init];
 
 		NSEvent*	currEvent = [NSApp nextEventMatchingMask: NSLeftMouseUpMask | NSRightMouseUpMask | NSOtherMouseUpMask
@@ -45,7 +38,7 @@ static PXIsDragStartResult PXIsDragStart( NSEvent *startEvent, NSTimeInterval th
 				case NSRightMouseUp:
 				case NSOtherMouseUp:
 				{
-					[pool release];
+					[pool drain];
 					return PXIsDragStartMouseReleased;	// Mouse released within the wait time.
 					break;
 				}
@@ -59,7 +52,7 @@ static PXIsDragStartResult PXIsDragStart( NSEvent *startEvent, NSTimeInterval th
 					CGFloat	yMouseMovement = CGFLOATABS(newPos.y -startPos.y);
 					if( xMouseMovement > 2 or yMouseMovement > 2 )
 					{
-						[pool release];
+						[pool drain];
 						return (xMouseMovement > yMouseMovement) ? PXIsDragStartMouseMovedHorizontally : PXIsDragStartMouseMovedVertically;	// Mouse moved within the wait time, probably a drag!
 					}
 					break;
@@ -69,7 +62,7 @@ static PXIsDragStartResult PXIsDragStart( NSEvent *startEvent, NSTimeInterval th
 
 	}
 
-	[pool release];
+	[pool drain];
 	return PXIsDragStartTimedOut;	// If they held the mouse that long, they probably wanna drag.
 }
 
@@ -112,6 +105,7 @@ - (void)keyDown:(NSEvent *)theEvent
 
 - (void)moveUp:(id)sender
 {
+#pragma unused(sender)
     if([_selectedRows count]>0) {
         NSUInteger firstIndex = [_selectedRows firstIndex];
 
@@ -126,6 +120,7 @@ - (void)moveUp:(id)sender
 
 - (void)moveDown:(id)sender
 {
+#pragma unused(sender)
     if([_selectedRows count]>0) {
         NSUInteger lastIndex = [_selectedRows lastIndex];
 
@@ -217,7 +212,6 @@ - (void)handleMouseDown:(NSEvent*)theEvent inCell:(PXListViewCell*)theCell // Ce
 
 - (void)handleMouseDownOutsideCells: (NSEvent*)theEvent
 {
-#pragma unused(theEvent)
     //[[self window] makeFirstResponder: self];
     //
 	if( _allowsEmptySelection )
@@ -243,6 +237,9 @@ - (void)handleMouseDownOutsideCells: (NSEvent*)theEvent
 
 - (BOOL)attemptDragWithMouseDown:(NSEvent*)theEvent inCell:(PXListViewCell*)theCell
 {
+    if(!_dragSupported)
+        return NO;
+
 	PXIsDragStartResult	dragResult = PXIsDragStart( theEvent, 0.0 );
 	if( dragResult != PXIsDragStartMouseReleased /*&& (_verticalMotionCanBeginDrag || dragResult != PXIsDragStartMouseMovedVertically)*/ )	// Was a drag, not a click? Cool!
 	{
@@ -271,7 +268,7 @@ -(NSImage*)	dragImageForRowsWithIndexes: (NSIndexSet *)dragRows event: (NSEvent*
 	NSPoint		localMouse = [self convertPoint: NSZeroPoint fromView: clickedCell];
 
 	if ([clickedCell isFlipped]) {
-		localMouse = [self convertPoint:CGPointMake(0, NSHeight(clickedCell.frame) * 2) fromView:clickedCell];
+		localMouse = [self convertPoint:NSMakePoint(0, NSHeight(clickedCell.frame) * 2) fromView:clickedCell];
 	}
 
 	localMouse.y += [self documentVisibleRect].origin.y;

Classes/PXListView.h

@@ -10,7 +10,7 @@
 
 #import "PXListViewDelegate.h"
 #import "PXListViewCell.h"
-
+#import "PXListDocumentView.h"
 
 #if DEBUG
 #define PXLog(...)	NSLog(__VA_ARGS__)
@@ -38,6 +38,7 @@
 	BOOL _allowsMultipleSelection;
     NSInteger _lastSelectedRow;
 
+    BOOL _dragSupported;
 	BOOL _verticalMotionCanBeginDrag;
 
     BOOL _usesLiveResize;
@@ -54,11 +55,15 @@
 
 @property (nonatomic, assign) BOOL allowsEmptySelection;
 @property (nonatomic, assign) BOOL allowsMultipleSelection;
+
 @property (nonatomic, assign) BOOL verticalMotionCanBeginDrag;
+@property (nonatomic, assign) BOOL dragSupported;
 
 @property (nonatomic, assign) CGFloat cellSpacing;
 @property (nonatomic, assign) BOOL usesLiveResize;
 
+- (PXListDocumentView *)documentView;
+
 - (void)reloadData;
 -(void)reloadRowAtIndex:(NSInteger)inIndex;
 
@@ -72,7 +77,6 @@
 - (void)deselectRows;
 - (void)selectRowIndexes:(NSIndexSet*)rows byExtendingSelection:(BOOL)doExtend;
 
-- (void)scrollToRow:(NSUInteger)row;
 - (void)scrollRowToVisible:(NSUInteger)row;
 
 @end

Classes/PXListView.m

@@ -13,6 +13,8 @@
 #import "PXListViewCell+Private.h"
 #import "PXListView+UserInteraction.h"
 
+#import "PXListDocumentView.h"
+
 NSString * const PXListViewSelectionDidChange = @"PXListViewSelectionDidChange";
 
 
@@ -21,9 +23,14 @@ @implementation PXListView
 @synthesize cellSpacing = _cellSpacing;
 @synthesize allowsMultipleSelection = _allowsMultipleSelection;
 @synthesize allowsEmptySelection = _allowsEmptySelection;
+@synthesize dragSupported = _dragSupported;
 @synthesize verticalMotionCanBeginDrag = _verticalMotionCanBeginDrag;
 @synthesize usesLiveResize = _usesLiveResize;
 
+- (PXListDocumentView *)documentView {
+    return [super documentView];
+}
+
 #pragma mark -
 #pragma mark Init/Dealloc
 
@@ -36,6 +43,7 @@ - (id)initWithFrame:(NSRect)theFrame
 		_selectedRows = [[NSMutableIndexSet alloc] init];
 		_allowsEmptySelection = YES;
         _usesLiveResize = YES;
+        _dragSupported = YES;
 	}
 
 	return self;
@@ -50,6 +58,7 @@ - (id)initWithCoder:(NSCoder*)decoder
 		_selectedRows = [[NSMutableIndexSet alloc] init];
 		_allowsEmptySelection = YES;
         _usesLiveResize = YES;
+        _dragSupported = YES;
 	}
 
 	return self;
@@ -108,6 +117,7 @@ - (void)setDelegate:(id<PXListViewDelegate>)delegate
 
 -(void)reloadRowAtIndex:(NSInteger)inIndex;
 {
+#pragma unused(inIndex)
     [self cacheCellLayout];
     [self layoutCells];
     //[self layoutCellsForResizeEvent];
@@ -337,7 +347,9 @@ - (void)updateCells
 		{
 			for(NSUInteger i = NSMaxRange(_currentRange); i > NSMaxRange(visibleRange); i--)
 			{
-				[self enqueueCell:[_visibleCells lastObject]];
+                if([_visibleCells lastObject]) {
+                    [self enqueueCell:[_visibleCells lastObject]];
+                }
 			}
 		}
 	}
@@ -350,13 +362,15 @@ - (void)updateCells
 
 - (void)selectAll:(id)sender
 {
+#pragma unused(sender)
 	if(_allowsMultipleSelection) {
 		[self setSelectedRows:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, _numberOfRows)]];
 	}
 }
 
 - (void)deselectAll:(id)sender
 {
+#pragma unused(sender)
 	[self setSelectedRows:[NSIndexSet indexSet]];
 }
 
@@ -502,7 +516,7 @@ - (void)cacheCellLayout
 - (void)layoutCells
 {	
 	//Set the frames of the cells
-	for(id cell in _visibleCells)
+	for(PXListViewCell *cell in _visibleCells)
 	{
 		NSInteger row = [cell row];
 		[cell setFrame:[self rectOfRow:row]];
@@ -552,30 +566,10 @@ - (void)resizeWithOldSuperviewSize:(NSSize)oldBoundsSize
 
 - (void)contentViewBoundsDidChange:(NSNotification *)notification
 {
+#pragma unused(notification)
 	[self updateCells];
 }
 
-- (void)scrollToRow:(NSUInteger)row
-{
-    if(row >= _numberOfRows) {
-        return;
-    }
-
-    // Use minimal scroll necessary, so we don't force the selection to upper left of window:
-	NSRect visibleRect = [self documentVisibleRect];
-	NSRect rowRect = [self rectOfRow:row];
-
-	NSPoint newScrollPoint = rowRect.origin;
-
-    //Have we over-scrolled?
-	if(NSMaxY(rowRect) > NSMaxY(visibleRect)) {
-		newScrollPoint.y = _totalHeight - NSHeight(visibleRect);
-    }
-
-	[[self contentView] scrollToPoint:newScrollPoint];
-	[self reflectScrolledClipView:[self contentView]];
-}
-
 - (void)scrollRowToVisible:(NSUInteger)row
 {
 	if(row >= _numberOfRows) {
@@ -592,11 +586,11 @@ - (void)scrollRowToVisible:(NSUInteger)row
 
 	NSPoint newScrollPoint = rowRect.origin;
 
-    //Have we over-scrolled?
-	if(NSMaxY(rowRect) > NSMaxY(visibleRect)) {
-		newScrollPoint.y = _totalHeight - NSHeight(visibleRect);
-    }
-	
+    if(NSMaxY(visibleRect) > NSMaxY(rowRect))
+        newScrollPoint.y = NSMinY(rowRect);
+    else
+        newScrollPoint.y = NSMinY(visibleRect) - (NSMaxY(visibleRect) - NSMinY(rowRect)) + NSHeight(rowRect);
+
 	[[self contentView] scrollToPoint:newScrollPoint];
 	[self reflectScrolledClipView:[self contentView]];
 }
@@ -657,6 +651,7 @@ -(void)viewDidEndLiveResize
 
 -(void)windowSizing:(NSNotification *)inNot
 {
+#pragma unused(inNot)
     [self layoutCellsForResizeEvent];
 }
 

Classes/PXListViewCell.h

@@ -27,7 +27,7 @@
 @property (readonly) NSUInteger row;
 
 @property (readonly,getter=isSelected) BOOL selected;
-@property (assign) PXListViewDropHighlight dropHighlight;
+@property (assign,nonatomic) PXListViewDropHighlight dropHighlight;
 
 + (id)cellLoadedFromNibNamed:(NSString*)nibName reusableIdentifier:(NSString*)identifier;
 + (id)cellLoadedFromNibNamed:(NSString*)nibName bundle:(NSBundle*)bundle reusableIdentifier:(NSString*)identifier;

Classes/PXListViewCell.m

@@ -55,7 +55,7 @@ + (id)cellLoadedFromNibNamed:(NSString*)nibName bundle:(NSBundle*)bundle reusabl
 
 - (id)initWithReusableIdentifier:(NSString*)identifier
 {
-	if((self = [super initWithFrame: NSZeroRect]))
+	if((self = [self initWithFrame: NSZeroRect]))
 	{
 		_reusableIdentifier = [identifier copy];
 	}
@@ -66,7 +66,7 @@ - (id)initWithReusableIdentifier:(NSString*)identifier
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-	if((self = [super initWithCoder: aDecoder]))
+	if((self = [self initWithCoder: aDecoder]))
 	{
 		_reusableIdentifier = NSStringFromClass([self class]);
 	}
@@ -108,6 +108,7 @@ - (void)setDropHighlight:(PXListViewDropHighlight)inState
 
 - (void)drawRect:(NSRect)dirtyRect
 {
+#pragma unused(dirtyRect)
 	if(_dropHighlight == PXListViewDropAbove)
 	{
 		[[NSColor alternateSelectedControlColor] set];