From 54ccb03d29f1f1dfeba0c8d81c0c13743a862ec7 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Mon, 21 May 2001 11:11:14 +0000
Subject: Update from Simon to make startup and finalise work properly.

---
 win32/ScintillaWin.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'win32/ScintillaWin.cxx')

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() {
-- 
cgit v1.2.3