diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-06-29 11:42:13 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-06-29 11:42:13 +1000 |
| commit | 093b2d6514bbf5de6dfa47c4cc0381378891ece4 (patch) | |
| tree | d66ce4107a915820d52147ec0d8458b07368e79c | |
| parent | 0d4dd734b7b6e33ce87937447c20bdaf41c86e3e (diff) | |
| download | scintilla-mirror-093b2d6514bbf5de6dfa47c4cc0381378891ece4.tar.gz | |
Backport: Bug [#2111]. Retracted change to IME on GTK.
Backed out changeset: 512ec9ab2e7c
Backport of changeset 7611:8c487135a6e4.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 957c4a69b..1e7992cdc 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -591,10 +591,6 @@ Fix position of line caret when overstrike caret set to block. <a href="https://sourceforge.net/p/scintilla/bugs/2106/">Bug #2106</a>. </li> - <li> - On GTK, reset IME when mouse is clicked. - <a href="https://sourceforge.net/p/scintilla/bugs/2111/">Bug #2111</a>. - </li> </ul> <h3> <a href="https://sourceforge.net/projects/scintilla/files/scintilla/3.10.6/scintilla3106.zip/download">Release 3.10.6</a> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 714f75e4d..eab650179 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1726,16 +1726,9 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { if (event->type != GDK_BUTTON_PRESS) return FALSE; - if (im_context) { - PreEditString pes(im_context); - if (strlen(pes.str) > 0) - gtk_im_context_reset(im_context); - } - if (evbtn) { gdk_event_free(evbtn); } - evbtn = gdk_event_copy(reinterpret_cast<GdkEvent *>(event)); buttonMouse = event->button; const Point pt = PointOfEvent(event); |