From 9e7d406d43781859d05782ebb78c352b1489bb71 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Tue, 17 Jun 2014 15:44:37 +1000
Subject: Remove unused TopContainer method. Use less specific types when
 possible.

---
 cocoa/ScintillaCocoa.h  |  1 -
 cocoa/ScintillaCocoa.mm | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 8fa2d196b..05ee56c7c 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -133,7 +133,6 @@ public:
   void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
   sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
-  ScintillaView* TopContainer();
   NSScrollView* ScrollContainer();
   SCIContentView* ContentView();
 
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 9f6e36317..b4c16dce4 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -655,17 +655,6 @@ void ScintillaCocoa::CancelModes() {
 
 //--------------------------------------------------------------------------------------------------
 
-/**
- * Helper function to get the outer container which represents the Scintilla editor on application side.
- */
-ScintillaView* ScintillaCocoa::TopContainer()
-{
-  NSView* container = static_cast<NSView*>(wMain.GetID());
-  return static_cast<ScintillaView*>([[[container superview] superview] superview]);
-}
-
-//--------------------------------------------------------------------------------------------------
-
 /**
  * Helper function to get the scrolling view.
  */
@@ -718,7 +707,7 @@ PRectangle ScintillaCocoa::GetClientRectangle()
  */
 PRectangle ScintillaCocoa::GetClientDrawingRectangle() {
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1080
-  SCIContentView *content = ContentView();
+  NSView *content = ContentView();
   if ([content respondsToSelector: @selector(setPreparedContentRect:)]) {
     NSRect rcPrepared = [content preparedContentRect];
     if (!NSIsEmptyRect(rcPrepared))
@@ -760,7 +749,7 @@ void ScintillaCocoa::DiscardOverdraw()
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1080
   // If running on 10.9, reset prepared area to visible area
-  SCIContentView *content = ContentView();
+  NSView *content = ContentView();
   if ([content respondsToSelector: @selector(setPreparedContentRect:)]) {
     content.preparedContentRect = [content visibleRect];
   }
-- 
cgit v1.2.3