diff options
| author | nyamatongwe <unknown> | 2002-02-12 23:32:48 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2002-02-12 23:32:48 +0000 |
| commit | 03dea17fe7b2be066ca8ab3451b92bb1b9fa73ae (patch) | |
| tree | e190904e92e3341e900c07ac2b306106579921f4 /win32/ScintillaWin.cxx | |
| parent | cee192aef14978e07702fe7f37f14ab01a2e08fb (diff) | |
| download | scintilla-mirror-03dea17fe7b2be066ca8ab3451b92bb1b9fa73ae.tar.gz | |
Moved external lexer loading from initialisation of ScintillaWin object
to Scintilla_RegisterClasses to avoid possibility of thread contention.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index ddcab290b..dfb81e894 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -273,11 +273,6 @@ void ScintillaWin::Initialise() { // no effect. If the app hasnt, we really shouldnt ask them to call // it just so this internal feature works. ::OleInitialize(NULL); - -#ifdef SCI_LEXER - LexerManager *lexMan = LexerManager::GetInstance(); - lexMan->Load(); -#endif } void ScintillaWin::Finalise() { @@ -1924,6 +1919,10 @@ extern void Platform_Finalise(); void Scintilla_RegisterClasses(void *hInstance) { Platform_Initialise(hInstance); ScintillaWin::Register(reinterpret_cast<HINSTANCE>(hInstance)); +#ifdef SCI_LEXER + LexerManager *lexMan = LexerManager::GetInstance(); + lexMan->Load(); +#endif } // This function is externally visible so it can be called from container when building statically. |