diff options
-rw-r--r-- | cocoa/ScintillaCocoa.h | 1 | ||||
-rw-r--r-- | cocoa/ScintillaCocoa.mm | 15 |
2 files changed, 2 insertions, 14 deletions
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 @@ -656,17 +656,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. */ NSScrollView* ScintillaCocoa::ScrollContainer() { @@ -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]; } |