diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-18 18:04:14 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-07-18 18:04:14 +1000 |
| commit | 005de475361fba04da537decdec82ee4902e0f9d (patch) | |
| tree | 61eaf7d45b4937f2c69dee2abb934a9d5b13dd48 | |
| parent | 0fa7771be3ad0009ffa79ddc81ac9749c2f65db1 (diff) | |
| download | scintilla-mirror-005de475361fba04da537decdec82ee4902e0f9d.tar.gz | |
Backport: Bug [#1958]. Make doCommandBySelector work but avoid double effect of 'delete'
key.
Backport of changeset 6356:8526860a2628.
| -rw-r--r-- | cocoa/ScintillaView.mm | 11 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 2e35a5492..f7c9dcf1b 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -485,7 +485,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) - (void) doCommandBySelector: (SEL) selector { - if ([self respondsToSelector: @selector(selector)]) + if ([self respondsToSelector: selector]) [self performSelector: selector withObject: nil]; } @@ -723,10 +723,13 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) */ - (void) keyDown: (NSEvent *) theEvent { + bool handled = false; if (mMarkedTextRange.length == 0) - mOwner.backend->KeyboardInput(theEvent); - NSArray* events = [NSArray arrayWithObject: theEvent]; - [self interpretKeyEvents: events]; + handled = mOwner.backend->KeyboardInput(theEvent); + if (!handled) { + NSArray* events = [NSArray arrayWithObject: theEvent]; + [self interpretKeyEvents: events]; + } } //-------------------------------------------------------------------------------------------------- diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 78699b948..069a091f1 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -563,6 +563,11 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>. </li> <li> + On Cocoa, fix doCommandBySelector but avoid double effect of 'delete' + key. + <a href="http://sourceforge.net/p/scintilla/bugs/1958">Bug #1958</a>. + </li> + <li> On Qt, the updateUi signal includes the 'updated' flags. No updateUi signal is sent for focus in events. These changes make Qt behave more like the other platforms. |