aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaView.mm4
-rw-r--r--doc/ScintillaHistory.html3
2 files changed, 7 insertions, 0 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index f4c4f615f..1e85ab6e8 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -248,7 +248,10 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
- (void) updateTrackingAreas
{
if (trackingArea)
+ {
[self removeTrackingArea:trackingArea];
+ [trackingArea release];
+ }
int opts = (NSTrackingActiveAlways | NSTrackingInVisibleRect | NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved);
trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
@@ -1244,6 +1247,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
- (void) dealloc
{
[mCurrentCursor release];
+ [trackingArea release];
[super dealloc];
}
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index d504bb6d3..496892db3 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -560,6 +560,9 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1931/">Bug #1931</a>.
</li>
<li>
+ On Cocoa, a leak of mouse tracking areas was fixed.
+ </li>
+ <li>
On Cocoa, the autocompletion is 4 pixels wider to avoid text truncation.
</li>
<li>