aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2013-03-15 20:12:24 +1100
committernyamatongwe <devnull@localhost>2013-03-15 20:12:24 +1100
commit7dc05d8d1ff8b415918817bb5963267b63c520e7 (patch)
tree60a6293b140a246d11adcbe62eea5e5dce27f039
parent0b1fa27bd4fbfba6e25c7d9bd439b15b656f9d5c (diff)
downloadscintilla-mirror-7dc05d8d1ff8b415918817bb5963267b63c520e7.tar.gz
Ensure all fields initialised.
-rw-r--r--cocoa/ScintillaCocoa.mm14
1 files changed, 9 insertions, 5 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index fa361df01..a80361ce4 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -383,6 +383,15 @@ ScintillaCocoa::ScintillaCocoa(NSView* view)
{
wMain = view; // Don't retain since we're owned by view, which would cause a cycle
timerTarget = [[TimerTarget alloc] init: this];
+ lastMouseEvent = NULL;
+ notifyObj = NULL;
+ notifyProc = NULL;
+ capturedMouse = false;
+
+ scrollSpeed = 1;
+ scrollTicks = 2000;
+ tickTimer = NULL;
+ idleTimer = NULL;
observer = NULL;
layerFindIndicator = NULL;
Initialise();
@@ -405,11 +414,6 @@ void ScintillaCocoa::Initialise()
{
Scintilla_LinkLexers();
- notifyObj = NULL;
- notifyProc = NULL;
-
- capturedMouse = false;
-
// Tell Scintilla not to buffer: Quartz buffers drawing for us.
WndProc(SCI_SETBUFFEREDDRAW, 0, 0);