aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32
diff options
context:
space:
mode:
authorjohnsonj <unknown>2015-12-14 15:03:51 +1100
committerjohnsonj <unknown>2015-12-14 15:03:51 +1100
commit0ccfd637db4974013aabb997451b71b16394a8b0 (patch)
tree12bd9cd0f8f7a4a40cace25d6ba307cb24c18123 /win32
parent1597105fb3569664744fc3016da50499de4d9b34 (diff)
downloadscintilla-mirror-0ccfd637db4974013aabb997451b71b16394a8b0.tar.gz
Block IME when some selected text is protected.
Diffstat (limited to 'win32')
-rw-r--r--win32/ScintillaWin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index b97a39ff3..f536482a1 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1007,7 +1007,7 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
IMContext imc(MainHWND());
if (!imc.hIMC)
return 0;
- if (pdoc->IsReadOnly()) {
+ if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
return 0;
}