diff options
| author | nyamatongwe <devnull@localhost> | 2010-07-13 21:40:42 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-07-13 21:40:42 +1000 |
| commit | 0f8368b69dc3fd123dab6f0e06ec3f735fd14eb8 (patch) | |
| tree | c0f4f250840266e2cfcac2e03fa3f5e5a855da5f | |
| parent | d4d3f82cc71c64c05ce6efdcb61164092da51c2b (diff) | |
| download | scintilla-mirror-0f8368b69dc3fd123dab6f0e06ec3f735fd14eb8.tar.gz | |
Platform files changed for new lexer design.
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 5 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 5 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 12 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 9 |
4 files changed, 18 insertions, 13 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 3f4d20093..5be17c773 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -21,12 +21,11 @@ #include <vector> +#include "ILexer.h" + #ifdef SCI_LEXER #include "SciLexer.h" -#include "PropSet.h" #include "PropSetSimple.h" -#include "Accessor.h" -#include "KeyWords.h" #endif #include "SVector.h" diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 318c364e5..f91183aa2 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -219,6 +219,11 @@ ScintillaCocoa::~ScintillaCocoa() */ void ScintillaCocoa::Initialise() { + static bool initedLexers = false; + if (!initedLexers) { + initedLexers = true; + Scintilla_LinkLexers(); + } notifyObj = NULL; notifyProc = NULL; diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index dfe0c2f8b..1c7dfd2ea 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -7,6 +7,7 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <assert.h> #include <ctype.h> #include <time.h> @@ -22,14 +23,11 @@ #include "windows.h" #endif +#include "ILexer.h" #include "Scintilla.h" #include "ScintillaWidget.h" #ifdef SCI_LEXER #include "SciLexer.h" -#include "PropSet.h" -#include "PropSetSimple.h" -#include "Accessor.h" -#include "KeyWords.h" #endif #include "SVector.h" #include "SplitVector.h" @@ -61,6 +59,7 @@ #ifdef SCI_LEXER #include <glib.h> #include <gmodule.h> +#include "LexerModule.h" #include "ExternalLexer.h" #endif @@ -830,7 +829,7 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam #ifdef SCI_LEXER case SCI_LOADLEXERLIBRARY: - LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); + LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); break; #endif case SCI_TARGETASUTF8: @@ -2434,6 +2433,9 @@ GType scintilla_get_type() { void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { Platform_Initialise(); +#ifdef SCI_LEXER + Scintilla_LinkLexers(); +#endif atomClipboard = gdk_atom_intern("CLIPBOARD", FALSE); atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE); atomString = GDK_SELECTION_TYPE_STRING; diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 31a7a0ab5..570a2bc88 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -25,13 +25,12 @@ #include "Platform.h" +#include "ILexer.h" #include "Scintilla.h" + #ifdef SCI_LEXER #include "SciLexer.h" -#include "PropSet.h" -#include "PropSetSimple.h" -#include "Accessor.h" -#include "KeyWords.h" +#include "LexerModule.h" #endif #include "SplitVector.h" #include "Partitioning.h" @@ -2050,7 +2049,7 @@ void ScintillaWin::GetIntelliMouseParameters() { void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (!::OpenClipboard(MainHWND())) - return ; + return; ::EmptyClipboard(); GlobalMemory uniText; |