aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk
diff options
context:
space:
mode:
authormitchell <unknown>2020-01-03 19:46:53 -0500
committermitchell <unknown>2020-01-03 19:46:53 -0500
commitb6d260731bddb23d63f4a0990305b1d9501f7cf8 (patch)
tree2ec6039f887cb14498e469973b68aaca7a2c939e /gtk
parent8eb134dbbd44002f3acd90d91550875f161136fa (diff)
downloadscintilla-mirror-b6d260731bddb23d63f4a0990305b1d9501f7cf8.tar.gz
Backport: Move collection of modules from Catalogue.cxx to CatalogueModules.h so it can be reused.
Backport of changeset 7866:fff1071ea1db.
Diffstat (limited to 'gtk')
-rwxr-xr-xgtk/ScintillaGTK.cxx3
-rw-r--r--gtk/deps.mak1
2 files changed, 1 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 78e9ea661..277cb4d11 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -3030,9 +3030,6 @@ GType scintilla_object_get_type() {
void ScintillaGTK::ClassInit(OBJECT_CLASS *object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) {
Platform_Initialise();
-#ifdef SCI_LEXER
- Scintilla_LinkLexers();
-#endif
atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE);
atomString = GDK_SELECTION_TYPE_STRING;
atomUriList = gdk_atom_intern("text/uri-list", FALSE);
diff --git a/gtk/deps.mak b/gtk/deps.mak
index d16f60afa..6970424bc 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -121,6 +121,7 @@ Catalogue.o: \
../include/Scintilla.h \
../include/SciLexer.h \
../lexlib/LexerModule.h \
+ ../lexlib/CatalogueModules.h \
../src/Catalogue.h
CellBuffer.o: \
../src/CellBuffer.cxx \