aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-06-18 12:49:18 +1000
committerNeil <nyamatongwe@gmail.com>2019-06-18 12:49:18 +1000
commit1fd32d4f09181a872b78c238bdd7adaa65a62774 (patch)
treee522d8104c437b609a9d2aef8bcaca4cd2d7ef3d
parentba67c936a7f56191e396e6c6015ede77ed791240 (diff)
downloadscintilla-mirror-1fd32d4f09181a872b78c238bdd7adaa65a62774.tar.gz
Feature [feature-requests:#1297] 5: Separate IndicatorNumbers from IndicatorStyle.
Deprecate INDIC?_MASK as they depended on old style-byte indicators so are no longer valid.
-rw-r--r--include/Scintilla.iface20
1 files changed, 15 insertions, 5 deletions
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 103de292f..ad051861d 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -651,14 +651,20 @@ val INDIC_POINT=18
val INDIC_POINTCHARACTER=19
val INDIC_GRADIENT=20
val INDIC_GRADIENTCENTRE=21
+
+# INDIC_CONTAINER, INDIC_IME, INDIC_IME_MAX, and INDIC_MAX are indicator numbers,
+# not IndicatorStyles so should not really be in the INDIC_ enumeration.
+# They are redeclared in IndicatorNumbers INDICATOR_.
+val INDIC_CONTAINER=8
val INDIC_IME=32
val INDIC_IME_MAX=35
val INDIC_MAX=35
-val INDIC_CONTAINER=8
-val INDIC0_MASK=0x20
-val INDIC1_MASK=0x40
-val INDIC2_MASK=0x80
-val INDICS_MASK=0xE0
+
+enu IndicatorNumbers=INDICATOR_
+val INDICATOR_CONTAINER=8
+val INDICATOR_IME=32
+val INDICATOR_IME_MAX=35
+val INDICATOR_MAX=35
# Set an indicator to plain, squiggle or TT.
set void IndicSetStyle=2080(int indicator, int indicatorStyle)
@@ -5090,3 +5096,7 @@ get bool GetTwoPhaseDraw=2283(,)
# and then the foreground. This avoids chopping off characters that overlap the next run.
set void SetTwoPhaseDraw=2284(bool twoPhase,)
+val INDIC0_MASK=0x20
+val INDIC1_MASK=0x40
+val INDIC2_MASK=0x80
+val INDICS_MASK=0xE0