aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/ScintillaCocoa.h5
-rwxr-xr-xgtk/ScintillaGTK.cxx15
-rw-r--r--gtk/ScintillaGTKAccessible.cxx6
-rw-r--r--gtk/deps.mak8
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp10
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h5
-rw-r--r--src/ScintillaBase.cxx8
-rw-r--r--win32/ScintillaWin.cxx16
-rw-r--r--win32/deps.mak12
-rw-r--r--win32/nmdeps.mak12
10 files changed, 18 insertions, 79 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 0eb758ddc..6d446a9bf 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -27,11 +27,6 @@
#include "ILoader.h"
#include "ILexer.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSetSimple.h"
-#endif
-
#include "CharacterCategory.h"
#include "Position.h"
#include "UniqueString.h"
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 5e4abd13c..9e51f5c98 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -42,14 +42,8 @@
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#endif
#include "StringCopy.h"
#include "CharacterCategory.h"
-#ifdef SCI_LEXER
-#include "LexerModule.h"
-#endif
#include "Position.h"
#include "UniqueString.h"
#include "SplitVector.h"
@@ -78,10 +72,6 @@
#include "AutoComplete.h"
#include "ScintillaBase.h"
-#ifdef SCI_LEXER
-#include "ExternalLexer.h"
-#endif
-
#include "ScintillaGTK.h"
#include "scintilla-marshal.h"
#include "ScintillaGTKAccessible.h"
@@ -833,11 +823,6 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
case SCI_GETDIRECTPOINTER:
return reinterpret_cast<sptr_t>(this);
-#ifdef SCI_LEXER
- case SCI_LOADLEXERLIBRARY:
- LexerManager::GetInstance()->Load(ConstCharPtrFromSPtr(lParam));
- break;
-#endif
case SCI_TARGETASUTF8:
return TargetAsUTF8(CharPtrFromSPtr(lParam));
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 87fd20f27..8d67c782f 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -92,14 +92,8 @@
#include "ILexer.h"
#include "Scintilla.h"
#include "ScintillaWidget.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#endif
#include "StringCopy.h"
#include "CharacterCategory.h"
-#ifdef SCI_LEXER
-#include "LexerModule.h"
-#endif
#include "Position.h"
#include "UniqueString.h"
#include "SplitVector.h"
diff --git a/gtk/deps.mak b/gtk/deps.mak
index 3864544b7..d16f60afa 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -18,10 +18,8 @@ ScintillaGTK.o: \
../include/ILexer.h \
../include/Scintilla.h \
../include/ScintillaWidget.h \
- ../include/SciLexer.h \
../lexlib/StringCopy.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -49,7 +47,6 @@ ScintillaGTK.o: \
../src/Editor.h \
../src/AutoComplete.h \
../src/ScintillaBase.h \
- ../src/ExternalLexer.h \
ScintillaGTK.h \
scintilla-marshal.h \
ScintillaGTKAccessible.h \
@@ -62,10 +59,8 @@ ScintillaGTKAccessible.o: \
../include/ILexer.h \
../include/Scintilla.h \
../include/ScintillaWidget.h \
- ../include/SciLexer.h \
../lexlib/StringCopy.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -432,7 +427,8 @@ ScintillaBase.o: \
../src/EditView.h \
../src/Editor.h \
../src/AutoComplete.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h \
+ ../src/ExternalLexer.h
Selection.o: \
../src/Selection.cxx \
../include/Platform.h \
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 80e1f9949..87e05f12d 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -10,10 +10,6 @@
#include "ScintillaQt.h"
#include "PlatQt.h"
-#ifdef SCI_LEXER
-#include "LexerModule.h"
-#include "ExternalLexer.h"
-#endif
#include <QApplication>
#include <QDrag>
@@ -704,12 +700,6 @@ sptr_t ScintillaQt::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
case SCI_GETDIRECTPOINTER:
return reinterpret_cast<sptr_t>(this);
-#ifdef SCI_LEXER
- case SCI_LOADLEXERLIBRARY:
- LexerManager::GetInstance()->Load(reinterpret_cast<const char *>(lParam));
- break;
-#endif
-
default:
return ScintillaBase::WndProc(iMessage, wParam, lParam);
}
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index ffb9af380..7f69b2b54 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -59,11 +59,6 @@
#include "ScintillaBase.h"
#include "CaseConvert.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#include "PropSetSimple.h"
-#endif
-
#include <QObject>
#include <QAbstractScrollArea>
#include <QAction>
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 296f5f8e6..aec08be55 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -62,6 +62,10 @@
#include "AutoComplete.h"
#include "ScintillaBase.h"
+#ifdef SCI_LEXER
+#include "ExternalLexer.h"
+#endif
+
using namespace Scintilla;
ScintillaBase::ScintillaBase() {
@@ -1088,6 +1092,10 @@ sptr_t ScintillaBase::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPara
case SCI_GETLEXERLANGUAGE:
return StringResult(lParam, DocumentLexState()->GetName());
+ case SCI_LOADLEXERLIBRARY:
+ LexerManager::GetInstance()->Load(ConstCharPtrFromSPtr(lParam));
+ break;
+
case SCI_PRIVATELEXERCALL:
return reinterpret_cast<sptr_t>(
DocumentLexState()->PrivateCall(static_cast<int>(wParam), reinterpret_cast<void *>(lParam)));
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index b896ee458..bb99166c6 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -53,13 +53,7 @@
#include "ILexer.h"
#include "Scintilla.h"
-#ifdef SCI_LEXER
-#include "SciLexer.h"
-#endif
#include "CharacterCategory.h"
-#ifdef SCI_LEXER
-#include "LexerModule.h"
-#endif
#include "Position.h"
#include "UniqueString.h"
#include "SplitVector.h"
@@ -90,10 +84,6 @@
#include "AutoComplete.h"
#include "ScintillaBase.h"
-#ifdef SCI_LEXER
-#include "ExternalLexer.h"
-#endif
-
#include "PlatWin.h"
#include "HanjaDic.h"
#include "ScintillaWin.h"
@@ -1808,12 +1798,6 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
InvalidateStyleRedraw();
break;
-#ifdef SCI_LEXER
- case SCI_LOADLEXERLIBRARY:
- LexerManager::GetInstance()->Load(ConstCharPtrFromSPtr(lParam));
- break;
-#endif
-
case SCI_TARGETASUTF8:
return TargetAsUTF8(CharPtrFromSPtr(lParam));
diff --git a/win32/deps.mak b/win32/deps.mak
index 4f45f64c4..b7f4024cd 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -23,9 +23,7 @@ ScintillaWin.o: \
../include/Sci_Position.h \
../include/ILexer.h \
../include/Scintilla.h \
- ../include/SciLexer.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -54,7 +52,6 @@ ScintillaWin.o: \
../src/ElapsedPeriod.h \
../src/AutoComplete.h \
../src/ScintillaBase.h \
- ../src/ExternalLexer.h \
PlatWin.h \
HanjaDic.h \
ScintillaWin.h
@@ -65,9 +62,7 @@ ScintillaWinL.o: \
../include/Sci_Position.h \
../include/ILexer.h \
../include/Scintilla.h \
- ../include/SciLexer.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -96,7 +91,6 @@ ScintillaWinL.o: \
../src/ElapsedPeriod.h \
../src/AutoComplete.h \
../src/ScintillaBase.h \
- ../src/ExternalLexer.h \
PlatWin.h \
HanjaDic.h \
ScintillaWin.h
@@ -437,7 +431,8 @@ ScintillaBase.o: \
../src/EditView.h \
../src/Editor.h \
../src/AutoComplete.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h \
+ ../src/ExternalLexer.h
ScintillaBaseL.o: \
../src/ScintillaBase.cxx \
../include/Platform.h \
@@ -474,7 +469,8 @@ ScintillaBaseL.o: \
../src/EditView.h \
../src/Editor.h \
../src/AutoComplete.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h \
+ ../src/ExternalLexer.h
Selection.o: \
../src/Selection.cxx \
../include/Platform.h \
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index 9fac2cad5..f5610bb5b 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -23,9 +23,7 @@ $(DIR_O)/ScintillaWin.obj: \
../include/Sci_Position.h \
../include/ILexer.h \
../include/Scintilla.h \
- ../include/SciLexer.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -54,7 +52,6 @@ $(DIR_O)/ScintillaWin.obj: \
../src/ElapsedPeriod.h \
../src/AutoComplete.h \
../src/ScintillaBase.h \
- ../src/ExternalLexer.h \
PlatWin.h \
HanjaDic.h \
ScintillaWin.h
@@ -65,9 +62,7 @@ $(DIR_O)/ScintillaWinL.obj: \
../include/Sci_Position.h \
../include/ILexer.h \
../include/Scintilla.h \
- ../include/SciLexer.h \
../lexlib/CharacterCategory.h \
- ../lexlib/LexerModule.h \
../src/Position.h \
../src/UniqueString.h \
../src/SplitVector.h \
@@ -96,7 +91,6 @@ $(DIR_O)/ScintillaWinL.obj: \
../src/ElapsedPeriod.h \
../src/AutoComplete.h \
../src/ScintillaBase.h \
- ../src/ExternalLexer.h \
PlatWin.h \
HanjaDic.h \
ScintillaWin.h
@@ -437,7 +431,8 @@ $(DIR_O)/ScintillaBase.obj: \
../src/EditView.h \
../src/Editor.h \
../src/AutoComplete.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h \
+ ../src/ExternalLexer.h
$(DIR_O)/ScintillaBaseL.obj: \
../src/ScintillaBase.cxx \
../include/Platform.h \
@@ -474,7 +469,8 @@ $(DIR_O)/ScintillaBaseL.obj: \
../src/EditView.h \
../src/Editor.h \
../src/AutoComplete.h \
- ../src/ScintillaBase.h
+ ../src/ScintillaBase.h \
+ ../src/ExternalLexer.h
$(DIR_O)/Selection.obj: \
../src/Selection.cxx \
../include/Platform.h \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 22:10:06 +0000