Remove ImageAndTextCell, shess had an idea how to use NSButtonCell to do the

same thing.

BUG=29334
TEST=none

Review URL: http://codereview.chromium.org/467011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33756 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 229 deletions

diff --git a/third_party/apple/ImageAndTextCell.h b/third_party/apple/ImageAndTextCell.h
deleted file mode 100644
index 7e5f7e7..0000000
--- a/third_party/apple/ImageAndTextCell.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    ImageAndTextCell.h
-    Copyright (c) 2001-2006, Apple Computer, Inc., all rights reserved.
-    Author: Chuck Pisula
-
-    Subclass of NSTextFieldCell which can display text and an image simultaneously.
-*/
-
-/*
- IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
- consideration of your agreement to the following terms, and your use, installation, 
- modification or redistribution of this Apple software constitutes acceptance of these 
- terms.  If you do not agree with these terms, please do not use, install, modify or 
- redistribute this Apple software.
- 
- In consideration of your agreement to abide by the following terms, and subject to these 
- terms, Apple grants you a personal, non-exclusive license, under AppleÕs copyrights in 
- this original Apple software (the "Apple Software"), to use, reproduce, modify and 
- redistribute the Apple Software, with or without modifications, in source and/or binary 
- forms; provided that if you redistribute the Apple Software in its entirety and without 
- modifications, you must retain this notice and the following text and disclaimers in all 
- such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
- or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
- the Apple Software without specific prior written permission from Apple. Except as expressly
- stated in this notice, no other rights or licenses, express or implied, are granted by Apple
- herein, including but not limited to any patent rights that may be infringed by your 
- derivative works or by other works in which the Apple Software may be incorporated.
- 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
- EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
- USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
- REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
- WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
- OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-@interface ImageAndTextCell : NSTextFieldCell {
-@private
-    NSImage *image;
-}
-
-- (void)setImage:(NSImage *)anImage;
-- (NSImage *)image;
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
-- (NSSize)cellSize;
-
-@end
diff --git a/third_party/apple/ImageAndTextCell.m b/third_party/apple/ImageAndTextCell.m
deleted file mode 100644
index a93cc2e..0000000
--- a/third_party/apple/ImageAndTextCell.m
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-    ImageAndTextCell.m
-    Copyright (c) 2001-2006, Apple Computer, Inc., all rights reserved.
-    Author: Chuck Pisula
-
-    Milestones:
-    * 03-01-2001: Initial creation by Chuck Pisula
-    * 11-04-2005: Added hitTestForEvent:inRect:ofView: for better NSOutlineView support by Corbin Dunn
-
-    Subclass of NSTextFieldCell which can display text and an image simultaneously.
-*/
-
-/*
- IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
- consideration of your agreement to the following terms, and your use, installation, 
- modification or redistribution of this Apple software constitutes acceptance of these 
- terms.  If you do not agree with these terms, please do not use, install, modify or 
- redistribute this Apple software.
- 
- In consideration of your agreement to abide by the following terms, and subject to these 
- terms, Apple grants you a personal, non-exclusive license, under AppleÕs copyrights in 
- this original Apple software (the "Apple Software"), to use, reproduce, modify and 
- redistribute the Apple Software, with or without modifications, in source and/or binary 
- forms; provided that if you redistribute the Apple Software in its entirety and without 
- modifications, you must retain this notice and the following text and disclaimers in all 
- such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
- or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
- the Apple Software without specific prior written permission from Apple. Except as expressly
- stated in this notice, no other rights or licenses, express or implied, are granted by Apple
- herein, including but not limited to any patent rights that may be infringed by your 
- derivative works or by other works in which the Apple Software may be incorporated.
- 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
- EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
- USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
- 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
- REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
- WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
- OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#import "ImageAndTextCell.h"
-#import <AppKit/NSCell.h>
-
-@implementation ImageAndTextCell
-
-- (id)init {
-    if (self = [super init]) {
-        [self setLineBreakMode:NSLineBreakByTruncatingTail];
-        [self setSelectable:YES];
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [image release];
-    [super dealloc];
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-    ImageAndTextCell *cell = (ImageAndTextCell *)[super copyWithZone:zone];
-    // The image ivar will be directly copied; we need to retain or copy it.
-    cell->image = [image retain];
-    return cell;
-}
-
-- (void)setImage:(NSImage *)anImage {
-    if (anImage != image) {
-        [image release];
-        image = [anImage retain];
-    }
-}
-
-- (NSImage *)image {
-    return image;
-}
-
-- (NSRect)imageRectForBounds:(NSRect)cellFrame {
-    NSRect result;
-    if (image != nil) {
-        result.size = [image size];
-        result.origin = cellFrame.origin;
-        result.origin.x += 3;
-        result.origin.y += ceil((cellFrame.size.height - result.size.height) / 2);
-    } else {
-        result = NSZeroRect;
-    }
-    return result;
-}
-
-// We could manually implement expansionFrameWithFrame:inView: and drawWithExpansionFrame:inView: or just properly implement titleRectForBounds to get expansion tooltips to automatically work for us
-- (NSRect)titleRectForBounds:(NSRect)cellFrame {
-    NSRect result;
-    if (image != nil) {
-        CGFloat imageWidth = [image size].width;
-        result = cellFrame;
-        result.origin.x += (3 + imageWidth);
-        result.size.width -= (3 + imageWidth);
-    } else {
-        result = NSZeroRect;
-    }
-    return result;
-}
-
-
-- (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject event:(NSEvent *)theEvent {
-    NSRect textFrame, imageFrame;
-    NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge);
-    [super editWithFrame: textFrame inView: controlView editor:textObj delegate:anObject event: theEvent];
-}
-
-- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength {
-    NSRect textFrame, imageFrame;
-    NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge);
-    [super selectWithFrame: textFrame inView: controlView editor:textObj delegate:anObject start:selStart length:selLength];
-}
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
-    if (image != nil) {
-        NSRect	imageFrame;
-        NSSize imageSize = [image size];
-        NSDivideRect(cellFrame, &imageFrame, &cellFrame, 3 + imageSize.width, NSMinXEdge);
-        if ([self drawsBackground]) {
-            [[self backgroundColor] set];
-            NSRectFill(imageFrame);
-        }
-        imageFrame.origin.x += 3;
-        imageFrame.size = imageSize;
-
-        if ([controlView isFlipped])
-            imageFrame.origin.y += ceil((cellFrame.size.height + imageFrame.size.height) / 2);
-        else
-            imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
-
-        [image compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver];
-    }
-    [super drawWithFrame:cellFrame inView:controlView];
-}
-
-- (NSSize)cellSize {
-    NSSize cellSize = [super cellSize];
-    cellSize.width += (image ? [image size].width : 0) + 3;
-    return cellSize;
-}
-
-- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView {
-    NSPoint point = [controlView convertPoint:[event locationInWindow] fromView:nil];
-    // If we have an image, we need to see if the user clicked on the image portion.
-    if (image != nil) {
-        // This code closely mimics drawWithFrame:inView:
-        NSSize imageSize = [image size];
-        NSRect imageFrame;
-        NSDivideRect(cellFrame, &imageFrame, &cellFrame, 3 + imageSize.width, NSMinXEdge);
-        
-        imageFrame.origin.x += 3;
-        imageFrame.size = imageSize;
-        // If the point is in the image rect, then it is a content hit
-        if (NSMouseInRect(point, imageFrame, [controlView isFlipped])) {
-            // We consider this just a content area. It is not trackable, nor it it editable text. If it was, we would or in the additional items.
-            // By returning the correct parts, we allow NSTableView to correctly begin an edit when the text portion is clicked on.
-            return NSCellHitContentArea;
-        }        
-    }
-    // At this point, the cellFrame has been modified to exclude the portion for the image. Let the superclass handle the hit testing at this point.
-    return [super hitTestForEvent:event inRect:cellFrame ofView:controlView];    
-}
-
-
-@end
-