colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-03 15:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tolmasky

Browse Source 
Conflicts:
	AppKit/CPControl.j
	AppKit/CPTextField.j
This commit is contained in:
Francisco Tolmasky
2009-03-18 17:41:17 -07:00
parent c6e266b08f 9e7ca719d8
commit 880e4dfb3a
23 changed files with 365 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPCollectionView.j
+2 -1
View File
@@ -111,6 +111,7 @@
_tileWidth = -1.0;
_selectionIndexes = [CPIndexSet indexSet];
_isSelectable = YES;
}
return self;
@@ -258,7 +259,7 @@
*/
- (void)setSelectionIndexes:(CPIndexSet)anIndexSet
{
if (_selectionIndexes == anIndexSet)
if (_selectionIndexes == anIndexSet || !_isSelectable)
return;
var index = CPNotFound;