diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-11-16 09:27:40 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-11-16 09:27:40 +1100 |
| commit | e603bf45ce1d29f17a0d4233484b4ce1806f235a (patch) | |
| tree | bbd1363de3412f18d600403b0b64ba46383f0098 /include/Scintilla.h | |
| parent | ed72ad02a2f9c6bb616dfabb3e9459e7f5a45b37 (diff) | |
| download | scintilla-mirror-e603bf45ce1d29f17a0d4233484b4ce1806f235a.tar.gz | |
Deprecate non-branded struct names in Scintilla.h.
Diffstat (limited to 'include/Scintilla.h')
| -rw-r--r-- | include/Scintilla.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index b6c75a32d..8c8e592f1 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -1112,10 +1112,6 @@ struct Sci_TextToFind { struct Sci_CharacterRange chrgText; }; -#define CharacterRange Sci_CharacterRange -#define TextRange Sci_TextRange -#define TextToFind Sci_TextToFind - typedef void *Sci_SurfaceID; struct Sci_Rectangle { @@ -1136,8 +1132,6 @@ struct Sci_RangeToFormat { struct Sci_CharacterRange chrg; }; -#define RangeToFormat Sci_RangeToFormat - #ifndef __cplusplus /* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This * is not required in C++ code and actually seems to break ScintillaEditPy */ @@ -1154,8 +1148,6 @@ struct Sci_NotifyHeader { unsigned int code; }; -#define NotifyHeader Sci_NotifyHeader - struct SCNotification { Sci_NotifyHeader nmhdr; Sci_Position position; @@ -1207,6 +1199,12 @@ struct SCNotification { #define SCI_SETKEYSUNICODE 2521 #define SCI_GETKEYSUNICODE 2522 +#define CharacterRange Sci_CharacterRange +#define TextRange Sci_TextRange +#define TextToFind Sci_TextToFind +#define RangeToFormat Sci_RangeToFormat +#define NotifyHeader Sci_NotifyHeader + #endif #endif |