Bring outline view branch up to date with trunk (r3179:r3187).

1 files changed, 27 insertions, 22 deletions

diff --git a/Source/NoodleLineNumberView.h b/Source/NoodleLineNumberView.h
index 45f33c00..1d600720 100644
--- a/Source/NoodleLineNumberView.h
+++ b/Source/NoodleLineNumberView.h
@@ -29,37 +29,42 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class NoodleLineNumberMarker;
-
 @interface NoodleLineNumberView : NSRulerView
 {
-    // Array of character indices for the beginning of each line
-    NSMutableArray      *lineIndices;
-	NSFont              *font;
-	NSColor				*textColor;
-	NSColor				*alternateTextColor;
-	NSColor				*backgroundColor;
 
-	// Add support for selection by clicking/dragging
-	NSUInteger			dragSelectionStartLine;
-}
+	// Array of character indices for the beginning of each line
+	NSMutableArray  *lineIndices;
 
-- (id)initWithScrollView:(NSScrollView *)aScrollView;
+	NSFont          *font;
+	NSColor         *textColor;
+	NSColor         *alternateTextColor;
+	NSColor         *backgroundColor;
+	CGFloat         maxWidthOfGlyph;
+	CGFloat         maxWidthOfGlyph1;
+	CGFloat         maxWidthOfGlyph2;
+	CGFloat         maxWidthOfGlyph3;
+	CGFloat         maxWidthOfGlyph4;
+	CGFloat         maxWidthOfGlyph5;
+	CGFloat         maxWidthOfGlyph6;
+	CGFloat         maxWidthOfGlyph7;
+	CGFloat         maxWidthOfGlyph8;
+	NSDictionary    *textAttributes;
 
-- (void)setFont:(NSFont *)aFont;
-- (NSFont *)font;
+	// Add support for selection by clicking/dragging
+	NSUInteger      dragSelectionStartLine;
 
-- (void)setTextColor:(NSColor *)color;
-- (NSColor *)textColor;
+}
 
-- (void)setAlternateTextColor:(NSColor *)color;
-- (NSColor *)alternateTextColor;
+@property(retain) NSColor *alternateTextColor;
+@property(retain) NSColor *backgroundColor;
 
-- (void)setBackgroundColor:(NSColor *)color;
-- (NSColor *)backgroundColor;
+- (NSFont*)font;
+- (void)setFont:(NSFont*)aFont;
+- (NSColor*)textColor;
+- (void)setTextColor:(NSColor*)color;
 
+- (id)initWithScrollView:(NSScrollView *)aScrollView;
 - (NSUInteger)lineNumberForLocation:(CGFloat)location;
-
-- (NSUInteger)lineNumberForCharacterIndex:(NSUInteger)index inText:(NSString *)text;
+- (NSUInteger)lineNumberForCharacterIndex:(NSUInteger)index;
 
 @end