diff options
-rw-r--r-- | gtk/ScintillaGTK.cxx | 3 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 3 | ||||
-rw-r--r-- | src/ScintillaBase.h | 2 | ||||
-rw-r--r-- | win32/ScintillaWin.cxx | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 524a8bb57..ff2b1ffdf 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -2392,8 +2392,7 @@ void ScintillaGTK::PreeditChangedInlineThis() { return; } - if (preeditStr.uniStrLen == 0 || preeditStr.uniStrLen > maxLenInputIME) { - //fprintf(stderr, "Do not allow over 200 chars: %i\n", preeditStr.uniStrLen); + if (preeditStr.uniStrLen == 0) { ShowCaretAtCurrentPosition(); return; } diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index d7f25dbdc..326e29ff3 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -23,7 +23,6 @@ #define INDIC_INPUTMETHOD 24 -#define MAXLENINPUTIME 200 #define SC_INDICATOR_INPUT INDIC_IME #define SC_INDICATOR_TARGET INDIC_IME+1 #define SC_INDICATOR_CONVERTED INDIC_IME+2 @@ -557,7 +556,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event) } else if (!event->preeditString().isEmpty()) { const QString preeditStr = event->preeditString(); const unsigned int preeditStrLen = preeditStr.length(); - if ((preeditStrLen == 0) || (preeditStrLen > MAXLENINPUTIME)) { + if (preeditStrLen == 0) { sqt->ShowCaretAtCurrentPosition(); return; } diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index 39fb9d411..f03d1c090 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -32,8 +32,6 @@ protected: idcmdSelectAll=16 }; - enum { maxLenInputIME = 200 }; - int displayPopupMenu; Menu popup; AutoComplete ac; diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 8acf1d8af..d19287d21 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1085,7 +1085,7 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) { if (lParam & GCS_COMPSTR) { const std::wstring wcs = imc.GetCompositionString(GCS_COMPSTR); - if ((wcs.size() == 0) || (wcs.size() >= maxLenInputIME)) { + if (wcs.empty()) { ShowCaretAtCurrentPosition(); return 0; } |