Diff of /cocoa/ScintillaView.mm [658206] .. [f935c5] Maximize Restore

  Switch to side-by-side view

--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -50,7 +50,7 @@
 }
 
 
-@implementation MarginView
+@implementation SCIMarginView
 
 @synthesize marginWidth, owner;
 
@@ -149,7 +149,7 @@
 
 @end
 
-@implementation InnerView
+@implementation SCIContentView
 
 @synthesize owner = mOwner;
 
@@ -873,12 +873,12 @@
 //--------------------------------------------------------------------------------------------------
 
 /**
- * Specify the InnerView class. Can be overridden in a subclass to provide an InnerView subclass.
- */
-
-+ (Class) innerViewClass
-{
-  return [InnerView class];
+ * Specify the SCIContentView class. Can be overridden in a subclass to provide an SCIContentView subclass.
+ */
+
++ (Class) contentViewClass
+{
+  return [SCIContentView class];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1043,7 +1043,7 @@
   self = [super initWithFrame:frame];
   if (self)
   {
-    mContent = [[[[[self class] innerViewClass] alloc] initWithFrame:NSZeroRect] autorelease];
+    mContent = [[[[[self class] contentViewClass] alloc] initWithFrame:NSZeroRect] autorelease];
     mContent.owner = self;
 
     // Initialize the scrollers but don't show them yet.
@@ -1060,7 +1060,7 @@
     //[scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
     [self addSubview: scrollView];
 
-    marginView = [[MarginView alloc] initWithScrollView:scrollView];
+    marginView = [[SCIMarginView alloc] initWithScrollView:scrollView];
     marginView.owner = self;
     [marginView setRuleThickness:[marginView requiredThickness]];
     [scrollView setVerticalRulerView:marginView];
@@ -1306,7 +1306,7 @@
 
 //--------------------------------------------------------------------------------------------------
 
-- (InnerView*) content
+- (SCIContentView*) content
 {
   return mContent;
 }