From 81797180bc69d9dd134e226adb9a27b7d71e9a3b Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 13 Dec 2019 10:15:42 +1100 Subject: Backport: Move SCI_LOADLEXERLIBRARY from platform layers to ScintillaBase.cxx. This allows removal of related #include statements. Backport of changeset 7860:4ca969c2fa45. --- gtk/ScintillaGTK.cxx | 15 --------------- gtk/ScintillaGTKAccessible.cxx | 6 ------ gtk/deps.mak | 8 ++------ 3 files changed, 2 insertions(+), 27 deletions(-) (limited to 'gtk') diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 4e5ed1fbf..78e9ea661 100755 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -41,14 +41,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" @@ -77,10 +71,6 @@ #include "AutoComplete.h" #include "ScintillaBase.h" -#ifdef SCI_LEXER -#include "ExternalLexer.h" -#endif - #include "ScintillaGTK.h" #include "scintilla-marshal.h" #include "ScintillaGTKAccessible.h" @@ -832,11 +822,6 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case SCI_GETDIRECTPOINTER: return reinterpret_cast(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 7962b84dd..918df5149 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -91,14 +91,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 \ -- cgit v1.2.3