aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaView.mm2
-rw-r--r--doc/ScintillaHistory.html4
2 files changed, 6 insertions, 0 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 7b471f786..b6c39cf05 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -105,6 +105,8 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
- (void) mouseDown: (NSEvent *) theEvent
{
+ NSClipView *textView = [[self scrollView] contentView];
+ [[textView window] makeFirstResponder:textView];
owner.backend->MouseDown(theEvent);
}
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index d188f080a..914893b7e 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -482,6 +482,10 @@
When scroll width is tracked, take width of annotation lines into account.
</li>
<li>
+ On Cocoa, clicking in margin now sets focus.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
+ </li>
+ <li>
On Cocoa, multipaste mode now works.
<a href="http://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
</li>