diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-08-28 17:22:28 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-08-28 17:22:28 +1000 |
| commit | 8a541f67cbb7eaaaa7a7d55bc1ae40e218f5f39e (patch) | |
| tree | 9484479b3bd74d0ed8d2a1a4fc132fde3994f0b9 /include | |
| parent | b634b3d5f34edc335a25239e833f9054620c6094 (diff) | |
| download | scintilla-mirror-8a541f67cbb7eaaaa7a7d55bc1ae40e218f5f39e.tar.gz | |
New header ILoader.h defines ILoader interface as it does not belong in ILexer.h.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ILexer.h | 14 | ||||
| -rw-r--r-- | include/ILoader.h | 21 | ||||
| -rw-r--r-- | include/Sci_Position.h | 6 |
3 files changed, 27 insertions, 14 deletions
diff --git a/include/ILexer.h b/include/ILexer.h index 0e03dbdb0..455806a08 100644 --- a/include/ILexer.h +++ b/include/ILexer.h @@ -14,12 +14,6 @@ namespace Scintilla { #endif -#ifdef _WIN32 - #define SCI_METHOD __stdcall -#else - #define SCI_METHOD -#endif - enum { dvRelease4=2 }; class IDocument { @@ -81,14 +75,6 @@ public: virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0; }; -class ILoader { -public: - virtual int SCI_METHOD Release() = 0; - // Returns a status code from SC_STATUS_* - virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0; - virtual void * SCI_METHOD ConvertToDocument() = 0; -}; - #ifdef SCI_NAMESPACE } #endif diff --git a/include/ILoader.h b/include/ILoader.h new file mode 100644 index 000000000..e989de873 --- /dev/null +++ b/include/ILoader.h @@ -0,0 +1,21 @@ +// Scintilla source code edit control +/** @file ILoader.h + ** Interface for loading into a Scintilla document from a background thread. + **/ +// Copyright 1998-2017 by Neil Hodgson <neilh@scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef ILOADER_H +#define ILOADER_H + +#include "Sci_Position.h" + +class ILoader { +public: + virtual int SCI_METHOD Release() = 0; + // Returns a status code from SC_STATUS_* + virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0; + virtual void * SCI_METHOD ConvertToDocument() = 0; +}; + +#endif diff --git a/include/Sci_Position.h b/include/Sci_Position.h index 1360b2dce..abd0f3408 100644 --- a/include/Sci_Position.h +++ b/include/Sci_Position.h @@ -20,4 +20,10 @@ typedef size_t Sci_PositionU; // For Sci_CharacterRange which is defined as long to be compatible with Win32 CHARRANGE typedef long Sci_PositionCR; +#ifdef _WIN32 + #define SCI_METHOD __stdcall +#else + #define SCI_METHOD +#endif + #endif |