From 1f0f51151905638c121a4a3f3817683ed777fc5d Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 18 Jun 2019 12:49:18 +1000 Subject: Backport: 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. Backport of changeset 7587:fa37b07baf0e. --- include/Scintilla.iface | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 68b1d6706..6db58d488 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) @@ -5079,3 +5085,8 @@ set void SetKeysUnicode=2521(bool keysUnicode,) # Are keys always interpreted as Unicode? get bool GetKeysUnicode=2522(,) + +val INDIC0_MASK=0x20 +val INDIC1_MASK=0x40 +val INDIC2_MASK=0x80 +val INDICS_MASK=0xE0 -- cgit v1.2.3