aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaCocoa.mm
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2016-11-19 19:17:54 +1100
committerNeil Hodgson <nyamatongwe@gmail.com>2016-11-19 19:17:54 +1100
commit4962715acd499d0651147cd6a4a81340d75eeb9a (patch)
tree4c2b8170793f469af9695d29b8d896537418a4d5 /cocoa/ScintillaCocoa.mm
parent7534f0de9b9f218b918395b274afda65f35a2017 (diff)
downloadscintilla-mirror-4962715acd499d0651147cd6a4a81340d75eeb9a.tar.gz
Moved @private sections from header into implementation.
Hid properties and methods which are for internal use.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
-rw-r--r--cocoa/ScintillaCocoa.mm12
1 files changed, 8 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 90752d71c..076d6fcde 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -395,11 +395,15 @@ const CGFloat paddingHighlightY = 2;
//----------------- ScintillaCocoa -----------------------------------------------------------------
-ScintillaCocoa::ScintillaCocoa(SCIContentView* view, SCIMarginView* viewMargin)
+ScintillaCocoa::ScintillaCocoa(ScintillaView* sciView_, SCIContentView* viewContent, SCIMarginView* viewMargin)
{
vs.marginInside = false;
- wMain = view; // Don't retain since we're owned by view, which would cause a cycle
+
+ // Don't retain since we're owned by view, which would cause a cycle
+ sciView = sciView_;
+ wMain = viewContent;
wMargin = viewMargin;
+
timerTarget = [[TimerTarget alloc] init: this];
lastMouseEvent = NULL;
delegate = NULL;
@@ -896,7 +900,7 @@ sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPar
case SCI_SETPHASESDRAW: {
sptr_t r = ScintillaBase::WndProc(iMessage, wParam, lParam);
- [ContentView().owner updateIndicatorIME];
+ [sciView updateIndicatorIME];
return r;
}
@@ -1999,7 +2003,7 @@ bool ScintillaCocoa::SetScrollingSize(void) {
SetVerticalScrollPos();
enteredSetScrollingSize = false;
}
- [inner.owner setMarginWidth: vs.fixedColumnWidth];
+ [sciView setMarginWidth: vs.fixedColumnWidth];
return changes;
}