aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2001-05-21 11:11:14 +0000
committernyamatongwe <devnull@localhost>2001-05-21 11:11:14 +0000
commitb7326156280045529361e62977bdae7e18640990 (patch)
treeee8791ea91777108d786e220244a74a3a5a656af /win32/ScintillaWin.cxx
parentbd5470af2364a7f7305ee4dc5e4adb27d6f8f876 (diff)
downloadscintilla-mirror-b7326156280045529361e62977bdae7e18640990.tar.gz
Update from Simon to make startup and finalise work properly.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index ffd804e2d..e5c751e93 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -147,10 +147,6 @@ class ScintillaWin :
static HINSTANCE hInstance;
-#ifdef SCI_LEXER
- LexerManager *lexMan;
-#endif
-
ScintillaWin(HWND hwnd);
ScintillaWin(const ScintillaWin &) : ScintillaBase() {}
virtual ~ScintillaWin();
@@ -269,7 +265,8 @@ void ScintillaWin::Initialise() {
OleInitialize(NULL);
#ifdef SCI_LEXER
- lexMan = new LexerManager;
+ LexerManager *lexMan = LexerManager::GetInstance();
+ lexMan->Load();
#endif
}
@@ -278,10 +275,6 @@ void ScintillaWin::Finalise() {
SetTicking(false);
RevokeDragDrop(wMain.GetID());
OleUninitialize();
-
-#ifdef SCI_LEXER
- delete lexMan;
-#endif
}
void ScintillaWin::StartDrag() {