Move SCI_LOADLEXERLIBRARY from platform layers to ScintillaBase.cxx.

This allows removal of related #include statements.

3 files changed, 8 insertions, 32 deletions

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 \