Merge branch 'master' of git://github.com/280north/cappuccino

stevegeek · Mar 11, 2009 · cc8f8fe · cc8f8fe
2 parents c368731 + 38d72bc
commit cc8f8fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/AppKit/CPCollectionView.j b/AppKit/CPCollectionView.j
@@ -258,7 +258,7 @@
 */
 - (void)setSelectionIndexes:(CPIndexSet)anIndexSet
 {
-    if (_selectionIndexes == anIndexSet)
+    if (_selectionIndexes == anIndexSet || !_isSelectable)
         return;
 
     var index = CPNotFound;

diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
@@ -320,6 +320,7 @@ var CPControlBlackColor     = [CPColor blackColor];
     Sets the tooltip for the receiver.
     @param aToolTip the tooltip
 */
+/*
 -(void)setToolTip:(CPString)aToolTip
 {
     if (_toolTip == aToolTip)
@@ -331,15 +332,16 @@ var CPControlBlackColor     = [CPColor blackColor];
     _DOMElement.title = aToolTip;
 #endif
 }
-
+*/
 /*!
     Returns the receiver's tooltip
 */
+/*
 -(CPString)toolTip
 {
     return _toolTip;
 }
-
+*/
 /*!
     Returns the receiver's target action
 */