From 13814407453aebe75f47aef9ac7e70723d345eb9 Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Mon, 14 Oct 2013 08:14:52 +1100 Subject: To follow naming conventions InnerView was renamed to SCIContentView and MarginView was renamed to SCIMarginView. --- cocoa/ScintillaView.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cocoa/ScintillaView.h') diff --git a/cocoa/ScintillaView.h b/cocoa/ScintillaView.h index f6a0e0dea..41be9fa51 100644 --- a/cocoa/ScintillaView.h +++ b/cocoa/ScintillaView.h @@ -49,9 +49,9 @@ extern NSString *const SCIUpdateUINotification; @end /** - * MarginView draws line numbers and other margins next to the text view. + * SCIMarginView draws line numbers and other margins next to the text view. */ -@interface MarginView : NSRulerView +@interface SCIMarginView : NSRulerView { @private int marginWidth; @@ -67,10 +67,10 @@ extern NSString *const SCIUpdateUINotification; @end /** - * InnerView is the Cocoa interface to the Scintilla backend. It handles text input and + * SCIContentView is the Cocoa interface to the Scintilla backend. It handles text input and * provides a canvas for painting the output. */ -@interface InnerView : NSView +@interface SCIContentView : NSView { @private ScintillaView* mOwner; @@ -100,10 +100,10 @@ extern NSString *const SCIUpdateUINotification; Scintilla::ScintillaCocoa* mBackend; // This is the actual content to which the backend renders itself. - InnerView* mContent; + SCIContentView* mContent; NSScrollView *scrollView; - MarginView *marginView; + SCIMarginView *marginView; CGFloat zoomDelta; @@ -118,7 +118,7 @@ extern NSString *const SCIUpdateUINotification; @property (nonatomic, assign) id delegate; @property (nonatomic, readonly) NSScrollView *scrollView; -+ (Class) innerViewClass; ++ (Class) contentViewClass; - (void) positionSubViews; @@ -133,7 +133,7 @@ extern NSString *const SCIUpdateUINotification; // Scroller handling - (void) setMarginWidth: (int) width; - (void) scrollerAction: (id) sender; -- (InnerView*) content; +- (SCIContentView*) content; // NSTextView compatibility layer. - (NSString*) string; -- cgit v1.2.3