From d916d5e4963da4944e94caa61523022b4b9c20b5 Mon Sep 17 00:00:00 2001 From: mitchell Date: Thu, 11 Jul 2019 13:27:46 -0400 Subject: Backport: Feature [feature-requests:#1297] Fixed INDIC_MAX / INDICATOR_MAX. Backport of changeset 7595:7de39ba4c5a5. --- include/Scintilla.h | 2 +- qt/ScintillaEditBase/ScintillaEditBase.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Scintilla.h b/include/Scintilla.h index 288002dd1..ce5bb43d6 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -296,7 +296,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define INDIC_CONTAINER 8 #define INDIC_IME 32 #define INDIC_IME_MAX 35 -#define INDICATOR_MAX 35 +#define INDIC_MAX 35 #define INDICATOR_CONTAINER 8 #define INDICATOR_IME 32 #define INDICATOR_IME_MAX 35 diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 54b2c7896..5a80b1ddd 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -23,6 +23,7 @@ #define INDIC_INPUTMETHOD 24 +#define MAXLENINPUTIME 200 #define SC_INDICATOR_INPUT INDICATOR_IME #define SC_INDICATOR_TARGET INDICATOR_IME+1 #define SC_INDICATOR_CONVERTED INDICATOR_IME+2 -- cgit v1.2.3