diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-06-22 11:37:23 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-06-22 11:37:23 +1000 |
| commit | dd4e7804282ca821f1a82cbe9b0068cd675295ff (patch) | |
| tree | 01d4c00a47a382e42136a7cdde7e0ccdbd36af48 /win32/ScintillaWin.cxx | |
| parent | 08b7fa503f5cf22000e83769578939a3d03cc592 (diff) | |
| download | scintilla-mirror-dd4e7804282ca821f1a82cbe9b0068cd675295ff.tar.gz | |
Backport: Feature [feature-requests:#1297] Update to use INDICATOR_ instead of INDIC_ as
INDIC_ is also used for indicator styles.
Backport of changeset 7594:190079cd334f.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index f3764f424..e2cb3b4a2 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -128,10 +128,10 @@ constexpr UINT SC_WIN_IDLE = 5001; // and delivering SCN_UPDATEUI constexpr UINT SC_WORK_IDLE = 5002; -#define SC_INDICATOR_INPUT INDIC_IME -#define SC_INDICATOR_TARGET INDIC_IME+1 -#define SC_INDICATOR_CONVERTED INDIC_IME+2 -#define SC_INDICATOR_UNKNOWN INDIC_IME_MAX +#define SC_INDICATOR_INPUT INDICATOR_IME +#define SC_INDICATOR_TARGET INDICATOR_IME+1 +#define SC_INDICATOR_CONVERTED INDICATOR_IME+2 +#define SC_INDICATOR_UNKNOWN INDICATOR_IME_MAX #ifndef SCS_CAP_SETRECONVERTSTRING #define SCS_CAP_SETRECONVERTSTRING 0x00000004 @@ -929,7 +929,7 @@ void ScintillaWin::DrawImeIndicator(int indicator, int len) { // Draw an indicator on the character before caret by the character bytes of len // so it should be called after InsertCharacter(). // It does not affect caret positions. - if (indicator < 8 || indicator > INDIC_MAX) { + if (indicator < 8 || indicator > INDICATOR_MAX) { return; } pdoc->DecorationSetCurrentIndicator(indicator); |