Frameworks/Adium Framework/Source/AIListCell.m
branchadium-1.5.11
changeset 6016 325e2ab3406f
parent 4161 8de0a4e32e42
--- a/Frameworks/Adium Framework/Source/AIListCell.m	Thu Nov 14 20:57:01 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.m	Thu Nov 14 21:09:06 2019 -0500
@@ -106,10 +106,10 @@
 	isGroup = [[proxyObject listObject] isKindOfClass:[AIListGroup class]];
 }
 
-@synthesize isGroup, controlView;
+@synthesize isGroup, outlineControlView;
 
 //Return that this cell is draggable
-- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView
+- (NSCellHitResult)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView
 {
 	return NSCellHitContentArea;
 }
@@ -370,8 +370,8 @@
 - (BOOL)cellIsSelected
 {
 	return ([self isHighlighted] &&
-		   [[controlView window] isKeyWindow] &&
-		   [[controlView window] firstResponder] == controlView);
+		   [[self.outlineControlView window] isKeyWindow] &&
+		   [[self.outlineControlView window] firstResponder] == self.outlineControlView);
 }
 
 //YES if a grid would be visible behind this cell (needs to be drawn)
@@ -384,10 +384,10 @@
 - (NSColor *)backgroundColor
 {
 	//We could just call backgroundColorForRow: but it's best to avoid doing a rowForItem lookup if there is no grid
-	if ([controlView usesAlternatingRowBackgroundColors]) {
-		return [controlView backgroundColorForRow:[controlView rowForItem:proxyObject]];
+	if ([self.outlineControlView usesAlternatingRowBackgroundColors]) {
+		return [self.outlineControlView backgroundColorForRow:[self.outlineControlView rowForItem:proxyObject]];
 	} else {
-		return [controlView backgroundColor];
+		return [self.outlineControlView backgroundColor];
 	}
 }
 
@@ -434,7 +434,7 @@
 		value = [self labelString];
 		
 	} else if ([attribute isEqualToString:NSAccessibilityWindowAttribute]) {
-		value = [controlView window];
+		value = [self.outlineControlView window];
                 
 	} else {
 		value = [super accessibilityAttributeValue:attribute];