diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-07-10 15:06:50 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-07-10 15:06:50 +1000 |
| commit | 72b5df15f33da27c59efd54eb0c84e173ca8c692 (patch) | |
| tree | a65cbcf60c89542255a27672302e5de5e715624e /include/Scintilla.h | |
| parent | 34540c84e31840787054652b72be7709d79eb1a2 (diff) | |
| download | scintilla-mirror-72b5df15f33da27c59efd54eb0c84e173ca8c692.tar.gz | |
Backport: Optional indexing of line starts in UTF-8 documents by UTF-32 code points and
UTF-16 code units added.
Converted instances of C++17 std::string_view to C++11.
Also used const_casts where appropriate to fix compile errors.
Backport of changeset 7063:0d5edc93e280.
Diffstat (limited to 'include/Scintilla.h')
| -rw-r--r-- | include/Scintilla.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index 70f17918b..305e64c88 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -365,6 +365,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_GETLINEINDENTPOSITION 2128 #define SCI_GETCOLUMN 2129 #define SCI_COUNTCHARACTERS 2633 +#define SCI_COUNTCODEUNITS 2715 #define SCI_SETHSCROLLBAR 2130 #define SCI_GETHSCROLLBAR 2131 #define SC_IV_NONE 0 @@ -755,6 +756,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_POSITIONBEFORE 2417 #define SCI_POSITIONAFTER 2418 #define SCI_POSITIONRELATIVE 2670 +#define SCI_POSITIONRELATIVECODEUNITS 2716 #define SCI_COPYRANGE 2419 #define SCI_COPYTEXT 2420 #define SC_SEL_STREAM 0 @@ -1108,6 +1110,16 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCN_AUTOCCOMPLETED 2030 #define SCN_MARGINRIGHTCLICK 2031 #define SCN_AUTOCSELECTIONCHANGE 2032 +#ifndef SCI_DISABLE_PROVISIONAL +#define SC_LINECHARACTERINDEX_NONE 0 +#define SC_LINECHARACTERINDEX_UTF32 1 +#define SC_LINECHARACTERINDEX_UTF16 2 +#define SCI_GETLINECHARACTERINDEX 2710 +#define SCI_ALLOCATELINECHARACTERINDEX 2711 +#define SCI_RELEASELINECHARACTERINDEX 2712 +#define SCI_LINEFROMINDEXPOSITION 2713 +#define SCI_INDEXPOSITIONFROMLINE 2714 +#endif /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ /* These structures are defined to be exactly the same shape as the Win32 |