aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/ScintillaCocoa.h1
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--gtk/ScintillaGTK.cxx1
-rw-r--r--gtk/ScintillaGTKAccessible.cxx1
-rw-r--r--include/ILexer.h14
-rw-r--r--include/ILoader.h21
-rw-r--r--include/Sci_Position.h6
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp1
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h1
-rw-r--r--scripts/HeaderOrder.txt1
-rw-r--r--src/Document.cxx1
-rw-r--r--src/EditModel.cxx1
-rw-r--r--src/EditView.cxx1
-rw-r--r--src/Editor.cxx1
-rw-r--r--src/MarginView.cxx1
-rw-r--r--src/PositionCache.cxx1
-rw-r--r--src/ScintillaBase.cxx1
-rw-r--r--win32/ScintillaWin.cxx1
18 files changed, 45 insertions, 14 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 7573d85fd..37d46726b 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -25,6 +25,7 @@
#include <map>
#include <memory>
+#include "ILoader.h"
#include "ILexer.h"
#ifdef SCI_LEXER
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index faa16e696..4eb8c1e2a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -533,6 +533,10 @@
Released 16 August 2017.
</li>
<li>
+ The ILoader interface is defined in its own header ILoader.h as it is not
+ related to lexing so doesn't belong in ILexer.h.
+ </li>
+ <li>
The C++ lexer improved preprocessor conformance.<br />
Default value of 0 for undefined preprocessor symbols.<br />
#define A is treated as #define A 1.<br />
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 1e3d68320..21762464f 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -35,6 +35,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index fdcc20dbd..24ce8a950 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -84,6 +84,7 @@
// ScintillaGTK.h and stuff it needs
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
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
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index f2c6ef1db..7c0e68e7e 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -11,6 +11,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index fa6992c7c..1f33fe56b 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -28,6 +28,7 @@
#include "Scintilla.h"
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Position.h"
#include "UniqueString.h"
diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt
index c2c9849c8..c16b7bdff 100644
--- a/scripts/HeaderOrder.txt
+++ b/scripts/HeaderOrder.txt
@@ -79,6 +79,7 @@
#include "Platform.h"
#include "Sci_Position.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
diff --git a/src/Document.cxx b/src/Document.cxx
index 86339827a..c3a81f23d 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -32,6 +32,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index faf21623e..57d6941cf 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -20,6 +20,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 162a86425..011d16575 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -23,6 +23,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 05796c7bf..7670f6769 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -23,6 +23,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index cab0ed02c..a4d50217e 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -22,6 +22,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index 591cf2254..379c6f338 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -18,6 +18,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 378baad73..0f491c30e 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -19,6 +19,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index cd49124da..de1d6b8b4 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -44,6 +44,7 @@
#include "Platform.h"
+#include "ILoader.h"
#include "ILexer.h"
#include "Scintilla.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 15:03:59 +0000