aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-12-13 10:15:42 +1100
committerNeil <nyamatongwe@gmail.com>2019-12-13 10:15:42 +1100
commit54c7ef44396c43b964060cb15e2ebdbf7359cb02 (patch)
tree19e0aaa84f43dff55da2a4adefbbccdcc543a201 /gtk
parent9f57c6efaee18d374da2abdb2e556830f2beb592 (diff)
downloadscintilla-mirror-54c7ef44396c43b964060cb15e2ebdbf7359cb02.tar.gz
Move SCI_LOADLEXERLIBRARY from platform layers to ScintillaBase.cxx.
This allows removal of related #include statements.
Diffstat (limited to 'gtk')
-rwxr-xr-xgtk/ScintillaGTK.cxx15
-rw-r--r--gtk/ScintillaGTKAccessible.cxx6
-rw-r--r--gtk/deps.mak8
3 files changed, 2 insertions, 27 deletions
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 \