aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaEditBase.cpp
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-06-22 11:37:23 +1000
committerNeil <nyamatongwe@gmail.com>2019-06-22 11:37:23 +1000
commit39a55b921ece0756cdd1845e034a65633da07a64 (patch)
tree97c88624e0813955a987ad7c4bf3ca346fe205fa /qt/ScintillaEditBase/ScintillaEditBase.cpp
parentbc02d0c442355ca6bd20893749664a44584f25ef (diff)
downloadscintilla-mirror-39a55b921ece0756cdd1845e034a65633da07a64.tar.gz
Feature [feature-requests:#1297] Update to use INDICATOR_ instead of INDIC_ as
INDIC_ is also used for indicator styles.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaEditBase.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index a37adca1b..261dfa520 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -23,10 +23,10 @@
#define INDIC_INPUTMETHOD 24
-#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
// Q_WS_MAC and Q_WS_X11 aren't defined in Qt5
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
@@ -451,7 +451,7 @@ void ScintillaEditBase::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;
}
sqt->pdoc->DecorationSetCurrentIndicator(indicator);