From 23d76d437f1089cdd2cc7c01cf011ec21f7f7a63 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Fri, 15 Mar 2013 20:37:27 +1100
Subject: Added type safety by using InnerView where applicable instead of
 generic NSView.

---
 cocoa/ScintillaCocoa.h  | 7 ++++---
 cocoa/ScintillaCocoa.mm | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 27ce11fd8..302e39d97 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -54,6 +54,7 @@
 
 extern "C" NSString* ScintillaRecPboardType;
 
+@class InnerView;
 @class ScintillaView;
 
 @class FindHighlightLayer;
@@ -132,16 +133,16 @@ protected:
   virtual CaseFolder *CaseFolderForEncoding();
   virtual std::string CaseMapString(const std::string &s, int caseMapping);
   virtual void CancelModes();
-public:
-  NSView* ContentView();
 
-  ScintillaCocoa(NSView* view);
+public:
+  ScintillaCocoa(InnerView* view);
   virtual ~ScintillaCocoa();
 
   void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
   sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
   ScintillaView* TopContainer();
+  InnerView* ContentView();
 
   bool SyncPaint(void* gc, PRectangle rc);
   bool Draw(NSRect rect, CGContextRef gc);
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index a80361ce4..56de63d9c 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -379,7 +379,7 @@ const CGFloat paddingHighlightY = 2;
 
 //----------------- ScintillaCocoa -----------------------------------------------------------------
 
-ScintillaCocoa::ScintillaCocoa(NSView* view)
+ScintillaCocoa::ScintillaCocoa(InnerView* view)
 {
   wMain = view; // Don't retain since we're owned by view, which would cause a cycle
   timerTarget = [[TimerTarget alloc] init: this];
@@ -686,9 +686,9 @@ ScintillaView* ScintillaCocoa::TopContainer()
 /**
  * Helper function to get the inner container which represents the actual "canvas" we work with.
  */
-NSView* ScintillaCocoa::ContentView()
+InnerView* ScintillaCocoa::ContentView()
 {
-  return static_cast<NSView*>(wMain.GetID());
+  return static_cast<InnerView*>(wMain.GetID());
 }
 
 //--------------------------------------------------------------------------------------------------
-- 
cgit v1.2.3