diff options
| -rw-r--r-- | include/Scintilla.h | 12 | ||||
| -rw-r--r-- | include/Scintilla.iface | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index e2c318edf..246301578 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -107,6 +107,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_MARKNUM_FOLDERSUB 29 #define SC_MARKNUM_FOLDER 30 #define SC_MARKNUM_FOLDEROPEN 31 +#define SC_MASK_FOLDERS 0xFE000000 #define SCI_MARKERDEFINE 2040 #define SCI_MARKERSETFORE 2041 #define SCI_MARKERSETBACK 2042 @@ -187,10 +188,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define INDIC_TT 2 #define INDIC_DIAGONAL 3 #define INDIC_STRIKE 4 -#define INDIC0_MASK 32 -#define INDIC1_MASK 64 -#define INDIC2_MASK 128 -#define INDICS_MASK INDIC0_MASK | INDIC1_MASK | INDIC2_MASK +#define INDIC0_MASK 0x20 +#define INDIC1_MASK 0x40 +#define INDIC2_MASK 0x80 +#define INDICS_MASK 0xE0 #define SCI_INDICSETSTYLE 2080 #define SCI_INDICGETSTYLE 2081 #define SCI_INDICSETFORE 2082 @@ -581,9 +582,6 @@ struct SCNotification { int y; // SCN_DWELLSTART, SCN_DWELLEND }; -// This long line is caused by problems with continuation lines with some compilers so leave as is -#define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN) | (1<<SC_MARKNUM_FOLDERSUB) | (1<<SC_MARKNUM_FOLDERTAIL) | (1<<SC_MARKNUM_FOLDERMIDTAIL) | (1<<SC_MARKNUM_FOLDEROPENMID) | (1<<SC_MARKNUM_FOLDEREND)) - // Deprecation section listing all API features that are deprecated and will // will be removed completely in a future version. // To enable these features define INCLUDE_DEPRECATED_FEATURES diff --git a/include/Scintilla.iface b/include/Scintilla.iface index d83c71321..ec61386a8 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -253,6 +253,8 @@ val SC_MARKNUM_FOLDERSUB=29 val SC_MARKNUM_FOLDER=30 val SC_MARKNUM_FOLDEROPEN=31 +val SC_MASK_FOLDERS=0xFE000000 + # Set the symbol used for a particular marker number. fun void MarkerDefine=2040(int markerNumber, int markerSymbol) @@ -426,10 +428,10 @@ val INDIC_SQUIGGLE=1 val INDIC_TT=2 val INDIC_DIAGONAL=3 val INDIC_STRIKE=4 -val INDIC0_MASK=32 -val INDIC1_MASK=64 -val INDIC2_MASK=128 -val INDICS_MASK=INDIC0_MASK | INDIC1_MASK | INDIC2_MASK +val INDIC0_MASK=0x20 +val INDIC1_MASK=0x40 +val INDIC2_MASK=0x80 +val INDICS_MASK=0xE0 # Set an indicator to plain, squiggle or TT. set void IndicSetStyle=2080(int indic, int style) |