diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-03-16 10:53:56 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-03-16 10:53:56 +1100 |
| commit | 56a8cf324f8f69ca64c9d8abb4ef39777e73e81b (patch) | |
| tree | a8b0dc5509df865a4604a9fbdc64053317c8287d /include/Scintilla.h | |
| parent | b23671ce01cca7778949e96a067a60f8bacf1e94 (diff) | |
| download | scintilla-mirror-56a8cf324f8f69ca64c9d8abb4ef39777e73e81b.tar.gz | |
Backport: Update Scintilla.h to match reordering of Scintilla.iface.
Backport of changeset 8006:80e7c6071c8b.
Diffstat (limited to 'include/Scintilla.h')
| -rw-r--r-- | include/Scintilla.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index c2ea775b2..f688a9b7d 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -104,6 +104,13 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_IME_INLINE 1 #define SCI_GETIMEINTERACTION 2678 #define SCI_SETIMEINTERACTION 2679 +#define SC_ALPHA_TRANSPARENT 0 +#define SC_ALPHA_OPAQUE 255 +#define SC_ALPHA_NOALPHA 256 +#define SC_CURSORNORMAL -1 +#define SC_CURSORARROW 2 +#define SC_CURSORWAIT 4 +#define SC_CURSORREVERSEARROW 7 #define MARKER_MAX 31 #define SC_MARK_CIRCLE 0 #define SC_MARK_ROUNDRECT 1 @@ -727,10 +734,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_GETMOUSEDOWNCAPTURES 2385 #define SCI_SETMOUSEWHEELCAPTURES 2696 #define SCI_GETMOUSEWHEELCAPTURES 2697 -#define SC_CURSORNORMAL -1 -#define SC_CURSORARROW 2 -#define SC_CURSORWAIT 4 -#define SC_CURSORREVERSEARROW 7 #define SCI_SETCURSOR 2386 #define SCI_GETCURSOR 2387 #define SCI_SETCONTROLCHARSYMBOL 2388 @@ -825,18 +828,15 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_SETLENGTHFORENCODE 2448 #define SCI_ENCODEDFROMUTF8 2449 #define SCI_FINDCOLUMN 2456 -#define SCI_GETCARETSTICKY 2457 -#define SCI_SETCARETSTICKY 2458 #define SC_CARETSTICKY_OFF 0 #define SC_CARETSTICKY_ON 1 #define SC_CARETSTICKY_WHITESPACE 2 +#define SCI_GETCARETSTICKY 2457 +#define SCI_SETCARETSTICKY 2458 #define SCI_TOGGLECARETSTICKY 2459 #define SCI_SETPASTECONVERTENDINGS 2467 #define SCI_GETPASTECONVERTENDINGS 2468 #define SCI_SELECTIONDUPLICATE 2469 -#define SC_ALPHA_TRANSPARENT 0 -#define SC_ALPHA_OPAQUE 255 -#define SC_ALPHA_NOALPHA 256 #define SCI_SETCARETLINEBACKALPHA 2470 #define SCI_GETCARETLINEBACKALPHA 2471 #define CARETSTYLE_INVISIBLE 0 |