diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
| commit | 1e5288e9840e201a00bcb5ca3035d7aa807f1f8d (patch) | |
| tree | 0c1a47953f57b71c41cc7a63e156629c6c9d645b /Source/NoodleLineNumberView.m | |
| parent | 915a3831525bf3a9350648d82f86dd54ae366292 (diff) | |
| download | sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.gz sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.bz2 sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.zip | |
Bring outline view branch up to date with trunk (r3203:r3224).
Diffstat (limited to 'Source/NoodleLineNumberView.m')
| -rw-r--r-- | Source/NoodleLineNumberView.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/NoodleLineNumberView.m b/Source/NoodleLineNumberView.m index 1d44c939..15296c8e 100644 --- a/Source/NoodleLineNumberView.m +++ b/Source/NoodleLineNumberView.m @@ -175,8 +175,8 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); if ((aView != nil) && [aView isKindOfClass:[NSTextView class]]) { - layoutManager = [aView layoutManager]; - container = [aView textContainer]; + layoutManager = [(NSTextView*)aView layoutManager]; + container = [(NSTextView*)aView textContainer]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textDidChange:) name:NSTextStorageDidProcessEditingNotification object:[(NSTextView *)aView textStorage]]; [self invalidateLineIndices]; @@ -204,7 +204,7 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); - (NSUInteger)lineNumberForLocation:(CGFloat)location { - NSUInteger line, count, rectCount, i; + NSUInteger line, count, rectCount; NSRectArray rects; NSRect visibleRect; NSRange nullRange; @@ -252,7 +252,7 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); - (NSUInteger)lineNumberForCharacterIndex:(NSUInteger)index { NSUInteger left, right, mid, lineStart; - NSMutableArray *lines; + NSArray *lines; lines = [self lineIndices]; @@ -302,7 +302,7 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); NSString *labelText; NSUInteger rectCount, index, line, count; NSRectArray rects; - CGFloat ypos, yinset; + CGFloat yinset; NSSize stringSize; NSArray *lines; |